From 0afac26523a2a61e535f6fb55e0297ed05eae23b Mon Sep 17 00:00:00 2001
From: Damian <damian.zhaoying@avataresargentinos.com.ar>
Date: Mon, 26 May 2025 21:05:33 -0300
Subject: [PATCH] Modificaciones de UI

---
 autobuild.xml                                 |    1 +
 indra/newview/skins/default/toolbars.xml      |   16 +-
 .../skins/default/xui/en/floater_about.xml    |   41 +-
 .../default/xui/en/floater_fs_nearby_chat.xml |    2 +-
 .../default/xui/en/floater_fs_search.xml      |    2 +-
 .../default/xui/en/floater_media_browser.xml  |    2 +-
 .../default/xui/en/floater_preferences.xml    |   20 +-
 .../default/xui/en/floater_web_content.xml    |    6 +-
 .../default/xui/en/floater_whitelist.xml      |    4 +-
 .../skins/default/xui/en/menu_login.xml       |    8 +-
 .../skins/default/xui/en/menu_toolbars.xml    |    2 +-
 .../skins/default/xui/en/menu_viewer.xml      |   91 +-
 .../skins/default/xui/en/notifications.xml    |   67 +-
 .../skins/default/xui/en/panel_login.xml      |    2 +-
 .../default/xui/en/panel_login_first.xml      |    2 +-
 .../default/xui/en/panel_preferences_UI.xml   |   14 +-
 .../xui/en/panel_preferences_advanced.xml     |    2 +-
 .../xui/en/panel_preferences_alerts.xml       |    2 +-
 .../default/xui/en/panel_preferences_chat.xml |    4 +-
 .../xui/en/panel_preferences_crashreports.xml |    4 +-
 .../xui/en/panel_preferences_graphics1.xml    |    2 +-
 .../xui/en/panel_preferences_grids.xml        |  434 ++++
 .../default/xui/en/panel_preferences_puma.xml | 1776 +++++++++++++++++
 .../xui/en/panel_preferences_setup.xml        |    4 +-
 .../xui/en/panel_preferences_sound.xml        |    4 +-
 .../xui/en/panel_profile_secondlife.xml       |    7 -
 .../newview/skins/default/xui/en/strings.xml  |   30 +-
 .../skins/default/xui/es/floater_about.xml    |   16 +-
 .../default/xui/es/floater_fs_nearby_chat.xml |    2 +-
 .../default/xui/es/floater_fs_search.xml      |    2 +-
 .../default/xui/es/floater_media_browser.xml  |    2 +-
 .../default/xui/es/floater_preferences.xml    |    4 +-
 .../default/xui/es/floater_quickprefs.xml     |    4 +-
 .../skins/default/xui/es/menu_viewer.xml      |    6 +-
 .../skins/default/xui/es/notifications.xml    |   19 +-
 .../skins/default/xui/es/panel_fs_login.xml   |    1 +
 .../skins/default/xui/es/panel_login.xml      |    2 +-
 .../default/xui/es/panel_login_first.xml      |    2 +-
 .../default/xui/es/panel_preferences_UI.xml   |    6 +-
 .../xui/es/panel_preferences_advanced.xml     |    2 +-
 .../xui/es/panel_preferences_alerts.xml       |    2 +-
 .../default/xui/es/panel_preferences_chat.xml |    2 +-
 .../xui/es/panel_preferences_crashreports.xml |    2 +-
 .../xui/es/panel_preferences_graphics1.xml    |    2 +-
 .../xui/es/panel_preferences_grids.xml        |   35 +
 .../default/xui/es/panel_preferences_puma.xml |  159 ++
 .../xui/es/panel_preferences_sound.xml        |    4 +-
 .../newview/skins/default/xui/es/strings.xml  |   24 +-
 .../default/xui/it/floater_preferences.xml    |    4 +-
 .../xui/en/floater_preferences.xml            |   18 +-
 .../vintage/xui/en/floater_preferences.xml    |   20 +-
 51 files changed, 2612 insertions(+), 277 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_preferences_grids.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_preferences_puma.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_puma.xml

diff --git a/autobuild.xml b/autobuild.xml
index 9cbb4598..b3831b4c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3844,6 +3844,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
                 <array>
                   <string>--fmodstudio</string>
                   <string>--platform linux</string>
+                  <string>--package</string>
                 </array>
               </map>
               <key>default</key>
diff --git a/indra/newview/skins/default/toolbars.xml b/indra/newview/skins/default/toolbars.xml
index 144281f6..659855f7 100644
--- a/indra/newview/skins/default/toolbars.xml
+++ b/indra/newview/skins/default/toolbars.xml
@@ -8,29 +8,25 @@
      button_alignment="left"
      button_display_mode="icons_only"
      button_layout_style="fill">
-     <command name="howto"/>
      <command name="chat"/>
      <command name="speak"/>
      <command name="voice"/>
-     <command name="facebook"/>
      <command name="move"/>
      <command name="view"/>`
      <command name="people"/>
+     <command name="build"/>
+     <command name="snapshot"/>
      <command name="appearance"/>
      <command name="search"/>
      <command name="map"/>
      <command name="minimap"/>
-     <command name="snapshot"/>
-        <command
-         name="inventory" />
-        <command
-         name="animationoverride" />
-        <command
-         name="quickprefs" />
+     <command name="preferences"/>
+     <command name="inventory" />
+     <command name="animationoverride" />
+     <command name="quickprefs" />
    </bottom_toolbar>
    <left_toolbar
     button_display_mode="icons_only"
     button_layout_style="none">
-    <command name="destinations"/>
    </left_toolbar>
 </toolbars>
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 5ba46354..224e8854 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -33,8 +33,8 @@
         top="16"
         width="434"
         wrap="true">
-For the latest information about Firestorm, visit 
-https://www.firestormviewer.org
+For the latest information about Puma, visit 
+https://avataresargentinos.com.ar/puma
       </text>
       <text_editor
         parse_urls="true"
@@ -71,7 +71,7 @@ https://www.firestormviewer.org
         top="16"
         width="489"
         wrap="true">
-Firestorm would not be possible without the decision from Linden Lab to make their Second Life viewer source code available.
+Puma would not be possible without the decision from Linden Lab to make their Second Life viewer source code available.
 
 Second Life is brought to you by the Lindens, 
 with open source contributions from:
@@ -93,20 +93,20 @@ Dummy Name replaced at run time
     <panel
       height="920"
       border="true"
-      label="Firestorm Credits"
-      help_topic="about_fscredits_tab"
-      name="fs_credits_panel">
+      label="Puma Credits"
+      help_topic="about_pmcredits_tab"
+      name="pm_credits_panel">
         <scroll_container
          follows="all"
          layout="topleft"
          left="0"
-         name="fs_credits_scroll_container"
+         name="pm_credits_scroll_container"
          reserve_scroll_corner="false"
          top="16"
          bottom="-1"
          right="-4">
             <panel
-             name="fs_credits_scroll_container_content_panel"
+             name="pm_credits_scroll_container_content_panel"
              follows="left|top"
              layout="topleft"
              min_height="300"
@@ -120,13 +120,14 @@ Dummy Name replaced at run time
                  height="102"
                  layout="topleft"
                  left="5"
-                 name="firestorm_intro"
+                 name="puma_intro"
                  top="0"
                  width="450"
                  wrap="true">
-Firestorm is a community development project to improve the SecondLife(tm) Viewer experience. We package contributions from various community developers along with code from Linden Lab and ourselves to bring you a quality, feature-rich viewer experience backed up by a large volunteer support team. Firestorm is brought to you by The Phoenix Firestorm Project, Inc., a non-profit organization.
+Puma is a personal development project to improve the SecondLife(tm) Viewer experience. We package contributions from various community developers along with code f
+rom Linden Lab and, mainly, from Firestorm Viewer Project. Puma is brought to you by Avatares Argentinos.
 
-The Firestorm Development Team:
+The Puma Development Team:
                 </text>
                 <text
                  enabled="false"
@@ -136,22 +137,22 @@ The Firestorm Development Team:
                  left="5"
                  text_color="LtGray"
                  max_length="65536"
-                 name="firestorm_names"
+                 name="puma_names"
                  top_pad="4"
                  width="450"
                  wrap="true">
-Angeldark Raymaker, Ansariel Hiller, ArminWeatherHax, Arrehn Oberlander, Beq Janus, Chanayane, Cinder Roxley, Hecklezz, Holy Gavenkrantz, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGregGreg Back, minerjr, Mobius Ryba, Nicky Dasmijn, PanteraPolnocy, ScentualLust, Selo Jacobus, SimonLsAlt, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Tozh Taurog, Vortex Saito, WoLf Loonie, Wolfspirit Magic, Yay N' Stuff (mygoditsfullofstars), and Zi Ree.
+Damian Zhaoying and Hinaichigo Xaris.
                 </text>
                 <text
                  follows="top|left"
                  height="15"
                  layout="topleft"
                  left="5"
-                 name="fs_contrib_intro"
+                 name="pm_contrib_intro"
                  top_pad="8"
                  width="450"
                  wrap="true">
-Additional code generously contributed to Firestorm by:
+Additional code generously contributed to Puma by:
                 </text>
                 <text
                  enabled="false"
@@ -161,7 +162,7 @@ Additional code generously contributed to Firestorm by:
                  left="5"
                  text_color="LtGray"
                  max_length="65536"
-                 name="fs_contrib_names"
+                 name="pm_contrib_names"
                  top_pad="4"
                  width="450"
                  wrap="true">
@@ -176,7 +177,7 @@ Aira Yumi, Albatroz Hird, Alexie Birman, Andromeda Rage, Angus Boyd, Animats, Ar
                  top_pad="8"
                  width="450"
                  wrap="true">
-Special thanks to our Firestorm Support Team, Beta Testers, wiki editors, educators and translators:
+Special thanks to Firestorm Support Team, Beta Testers, wiki editors, educators and translators:
                 </text>
                 <text
                  enabled="false"
@@ -197,11 +198,11 @@ Afrika Burton, Albatroz Hird, Alexru Resident, alison Seesaw, AnaLucia Loon, Ang
                  height="78"
                  layout="topleft"
                  left="5"
-                 name="fs_art_intro"
+                 name="pm_art_intro"
                  top_pad="8"
                  width="450"
                  wrap="true">
-Firestorm includes Starlight, modified for Firestorm. It is provided by residents for residents, with the intention of providing an alternative, brighter, and hopefully easier to use interface. For further details see &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
+Puma includes Starlight, modified for Firestorm. It is provided by residents for residents, with the intention of providing an alternative, brighter, and hopefully easier to use interface. For further details see &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
 
 UI Artists and Designers:
                 </text>
@@ -217,7 +218,7 @@ UI Artists and Designers:
                  top_pad="4"
                  width="450"
                  wrap="true">
-Adam Frisby, Alexandrea Fride, DarkAgent Baphomet, David Rowe, Digital Scribe, Dragonborn Forzane, Hitomi Tiponi, Hugh Helendale, KirstenLee Cinquetti, Mobius Ryba, Nadin, Naomah Beaumont, psi Merlin, samm florian, Sammie Benoir, Tommi Waydelich and Vincent Nacon.
+Hinaichigo Xaris, Adam Frisby, Alexandrea Fride, DarkAgent Baphomet, David Rowe, Digital Scribe, Dragonborn Forzane, Hitomi Tiponi, Hugh Helendale, KirstenLee Cinquetti, Mobius Ryba, Nadin, Naomah Beaumont, psi Merlin, samm florian, Sammie Benoir, Tommi Waydelich and Vincent Nacon.
                 </text>
             </panel>
         </scroll_container>
diff --git a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
index e679091f..58fbef77 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_nearby_chat.xml
@@ -331,7 +331,7 @@
                min_val="-2147483647"
                mouse_opaque="true"
                name="ChatChannel"
-               tool_tip="Channel to send chat on. Enabled in Preferences -> Chat -> Firestorm -> Show channel selection in chat bar." />
+               tool_tip="Channel to send chat on. Enabled in Preferences -> Chat -> Puma -> Show channel selection in chat bar." />
 
             </layout_panel>
             <layout_panel
diff --git a/indra/newview/skins/default/xui/en/floater_fs_search.xml b/indra/newview/skins/default/xui/en/floater_fs_search.xml
index 0249d0fa..61373c09 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_search.xml
@@ -12,7 +12,7 @@
 	positioning="centered"
 	save_rect="true"
 	single_instance="true"
-	title="Firestorm Search"
+	title="Puma Search"
 	width="780">
 	<!-- Strings -->
 	<floater.string name="string.location">
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index eafdbbe5..c330a333 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -202,7 +202,7 @@
 The web browser plugin seems to be taking a while to open.
 If the plugin never loads, please visit:
 
-https://wiki.firestormviewer.org/fs_media
+https://wiki.avataresargentinos.com.ar
 
 for possible steps to resolve this issue.
           </text>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index fe05b635..92e1162f 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -198,19 +198,19 @@
          help_topic="preferences_crashreports_tab"
          name="crashreports" />
         <panel
-         class="panel_preference_firestorm"
-         filename="panel_preferences_firestorm.xml"
-         label="Firestorm"
+         class="panel_preference_puma"
+         filename="panel_preferences_puma.xml"
+         label="Puma"
          layout="topleft"
-         help_topic="preferences_firestorm_tab"
-         name="firestorm" />
+         help_topic="preferences_puma_tab"
+         name="puma" />
         <panel
-         class="panel_preference_opensim"
-         filename="panel_preferences_opensim.xml"
-         label="Opensim"
+         class="panel_preference_grids"
+         filename="panel_preferences_grids.xml"
+         label="Grids"
          layout="topleft"
-         help_topic="preferences_opensim_tab"
-         name="opensim" />
+         help_topic="preferences_grids_tab"
+         name="grids" />
         <panel
          class="panel_preference_backup"
          filename="panel_preferences_backup.xml"
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 320b049d..17fd711f 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -203,11 +203,7 @@
 The web browser plugin seems to be taking a while to open.
 If the plugin never loads, please visit:
 
-https://wiki.firestormviewer.org/fs_search_issues
-
-and
-
-https://wiki.firestormviewer.org/fs_media
+https://wiki.avataresargentinos.com.ar/
 
 for possible steps to resolve this issue.
       </text>
diff --git a/indra/newview/skins/default/xui/en/floater_whitelist.xml b/indra/newview/skins/default/xui/en/floater_whitelist.xml
index 4e91769f..361de3fb 100644
--- a/indra/newview/skins/default/xui/en/floater_whitelist.xml
+++ b/indra/newview/skins/default/xui/en/floater_whitelist.xml
@@ -18,7 +18,7 @@ Anti-virus and Anti-malware are an essential part of safe Internet use, but they
 To reduce interference and improve stability and performance, we strongly advise that all users ensure that there are exclusions (known as Whitelisting) for important folders and programs that the viewer uses. 
 
 For more detailed information, visit
-https://wiki.firestormviewer.org/antivirus_whitelisting
+https://wiki.avataresargentinos.com.ar
      
      </text>
      <text
@@ -71,4 +71,4 @@ Add the full paths to your AV executable exclusions as shown in the above wiki.
           top_pad="5"
           width="689"
           word_wrap="true" />
-</floater>
\ No newline at end of file
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 509e63c3..a84ce85f 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -57,13 +57,13 @@
      tear_off="true"
      name="Help">
         <menu_item_call
-         label="Firestorm Wiki"
-         name="Firestorm Wiki"
+         label="Avatares Argentinos Wiki"
+         name="Avatares Argentinos Wiki"
          shortcut="F1">
             <menu_item_call.on_click
              function="PromptShowURL"
              name="script_library_url"
-             parameter="WebLaunchExternalTarget,https://wiki.firestormviewer.org/doku.php?id=start" />
+             parameter="WebLaunchExternalTarget,https://wiki.avataresargentinos.com.ar" />
        </menu_item_call>
        <menu_item_call
         label="Troubleshooting"
@@ -71,7 +71,7 @@
            <menu_item_call.on_click
             function="PromptShowURL"
             name="wiki_troubleshooting_url"
-            parameter="WebLaunchExternalTarget,https://wiki.firestormviewer.org/firestorm_troubleshooting" />
+            parameter="WebLaunchExternalTarget,https://wiki.avataresargentinos.com.ar" />
        </menu_item_call>
         <menu_item_call
          label="Guidebook"
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index 19eab34e..d0f6f802 100644
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
-<!-- <FS:Zi> This file is not used in Firestorm, we use the horizontal/vertical files -->
+<!-- <FS:Zi> This file is not used in Puma, we use the horizontal/vertical files -->
 
 <context_menu
       layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6406e17f..53400635 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2454,53 +2454,53 @@
              parameter="WebLaunchExternalTarget,https://community.secondlife.com" />
        </menu_item_call>
        <menu_item_separator/>
-    	<menu_item_call
-             label="Firestorm Blog"
-             name="Firestorm Blog">
+        <menu_item_call
+             label="Avatares Argentinos Blog"
+             name="Avatares Argentinos Blog">
              <menu_item_call.on_click
              function="PromptShowURL"
-             name="firestorm_blog_url"
-             parameter="WebLaunchExternalTarget,https://www.firestormviewer.org/" />
+             name="avataresargentinos_blog_url"
+             parameter="WebLaunchExternalTarget,https://avtaresargentinos.com.ar/" />
        </menu_item_call>
     	<menu_item_call
-             label="Firestorm Flickr"
-             name="Firestorm Flickr">
+             label="Ayuda Virtual Blog"
+             name="Ayuda Virtual Blog">
              <menu_item_call.on_click
              function="PromptShowURL"
-             name="firestorm_flickr_url"
-             parameter="WebLaunchExternalTarget,http://www.flickr.com/groups/firestormviewer/pool/" />
+             name="ayudavirtual_blog_url"
+             parameter="WebLaunchExternalTarget,https://ayudavirtual.org/" />
        </menu_item_call>
     	<menu_item_call
-             label="Firestorm YouTube"
-             name="Firestorm YouTube">
+             label="Ayuda Virtual Flickr"
+             name="Ayuda Virtual Flickr">
              <menu_item_call.on_click
              function="PromptShowURL"
-             name="firestorm_youtube_url"
-             parameter="WebLaunchExternalTarget,http://www.youtube.com/user/PhoenixViewerSL" />
+             name="ayudavirtual_flickr_url"
+             parameter="WebLaunchExternalTarget,https://www.flickr.com/people/ayudavirtual/" />
        </menu_item_call>
     	<menu_item_call
-             label="Firestorm Twitter"
-             name="Firestorm Twitter">
+             label="Ayuda Virtual YouTube"
+             name="Ayuda Virtual YouTube">
              <menu_item_call.on_click
              function="PromptShowURL"
-             name="firestorm_twitter_url"
-             parameter="WebLaunchExternalTarget,https://twitter.com/phoenixviewersl" />
+             name="ayudavirtual_youtube_url"
+             parameter="WebLaunchExternalTarget,https://www.youtube.com/@AYUDAVIRTUALSecondlife" />
        </menu_item_call>
     	<menu_item_call
-             label="Firestorm Plurk"
-             name="Firestorm Plurk">
+             label="Avatares Argentinos X/Twitter"
+             name="Avatares Argentinos Twitter">
              <menu_item_call.on_click
              function="PromptShowURL"
-             name="firestorm_plurk_url"
-             parameter="WebLaunchExternalTarget,http://www.plurk.com/ThePhoenixViewerProject" />
+             name="avataresargentinos_twitter_url"
+             parameter="WebLaunchExternalTarget,https://x.com/Avat_Arg" />
        </menu_item_call>
-       <menu_item_separator/>
-       <menu_item_call
-             label="Message of the day"
-             name="Firestorm MoTD">
-             <menu_item_call.on_click
-             function="Advanced.ToggleHUDInfo"
-             parameter="motd" />
+        <menu_item_call 
+             label="Ayuda Virtual X/Twitter"
+             name="Ayuda Virtual Twitter">
+             <menu_item_call.on_click  
+             function="PromptShowURL"    
+             name="ayudavirtual_twitter_url"
+             parameter="WebLaunchExternalTarget,https://x.com/ayuda_sl" />
        </menu_item_call>
       </menu>   
     
@@ -2523,51 +2523,42 @@
         </menu_item_check>
         
         <menu_item_call
-         label="Firestorm Wiki"
-         name="Firestorm Wiki"
+         label="Avatares Argentinos Wiki"
+         name="Avatares Argentinos Wiki"
 	     shortcut="F1">
              <menu_item_call.on_click
              function="PromptShowURL"
              name="script_library_url"
-             parameter="WebLaunchExternalTarget,https://wiki.firestormviewer.org" />
+             parameter="WebLaunchExternalTarget,https://wiki.avataresargentinos.com.ar" />
         </menu_item_call>
         
         <menu_item_call
-         label="Troubleshooting"
-         name="Troubleshooting">
+         label="Ayuda Virtual Tutoriales"
+         name="Ayuda Virtual Tutoriales">
             <menu_item_call.on_click
              function="PromptShowURL"
-             name="wiki_troubleshooting_url"
-             parameter="WebLaunchExternalTarget,https://wiki.firestormviewer.org/firestorm_troubleshooting" />
+             name="ayudabirtual_tutoriales_url"
+             parameter="WebLaunchExternalTarget,https://ayudavirtual.org/tutoriales" />
         </menu_item_call>
 	   
         <menu_item_call
-         label="Join Firestorm Support Group"
-         name="firestorm_support_group">
+         label="Join Puma Support Group"
+         name="puma_support_group">
             <menu_item_call.on_click
              function="Advanced.WebBrowserTest"
-             parameter="https://wiki.firestormviewer.org/firestorm_support_groups_join" />
+             parameter="https://wiki.avataresargentinos.com.ar/grupos_soporte_puma" />
             <menu_item_call.on_visible
              function="GridCheck"
              parameter="secondlife" />
         </menu_item_call>
 
         <menu_item_call
-         label="Firestorm Classes Schedule"
-         name="Firestorm Classes Schedule">
+         label="Ayuda Virtual Classes Schedule"
+         name="Ayuda Virtual Classes Schedule">
              <menu_item_call.on_click
              function="PromptShowURL"
              name="wiki_classes_url"
-             parameter="WebLaunchExternalTarget,https://wiki.firestormviewer.org/firestorm_classes" />
-        </menu_item_call>
-
-        <menu_item_call
-         label="Firestorm Events Calendar"
-         name="Firestorm Events Calendar">
-             <menu_item_call.on_click
-             function="PromptShowURL"
-             name="events_calendar_url"
-             parameter="WebLaunchExternalTarget,https://teamup.com/ksxdajnbw9mvw7cbwz" />
+             parameter="WebLaunchExternalTarget,https://ayudavirtual.org" />
         </menu_item_call>
 
         <menu_item_check
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d61d63d3..6bd43486 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -193,7 +193,7 @@ No tutorial is currently available.
    icon="alertmodal.tga"
    name="BadInstallation"
    type="alertmodal">
- Installation of [APP_NAME] is defective. Please [https://www.firestormviewer.org/downloads download a new copy] of the Viewer and reinstall.
+ Installation of [APP_NAME] is defective. Please [https://wiki.avataresargentinos.com.ar/descargas download a new copy] of the Viewer and reinstall.
     <tag>fail</tag>
     <usetemplate
      name="okbutton"
@@ -1905,7 +1905,7 @@ Visit [_URL] for more information?
     <tag>confirm</tag>
     <url option="0" name="url">
 
-			https://wiki.firestormviewer.org/fs_system_requirements
+			https://wiki.avataresargentinos.com.ar
     </url>
     <usetemplate
      ignoretext="My computer hardware is not supported"
@@ -3947,7 +3947,7 @@ We&apos;re having trouble connecting. There may be a problem with your Internet
 You can either check your Internet connection and try again in a few minutes, click Help to view the [SUPPORT_SITE], or click Teleport to attempt to teleport home.
     <url option="1" name="url">
 
-			https://www.firestormviewer.org/support/
+			https://wiki.avataresargentinos.com.ar
     </url>
     <form name="form">
       <button
@@ -3975,7 +3975,7 @@ We&apos;re having trouble connecting. There may be a problem with your Internet
 
 You can either check your Internet connection and try again in a few minutes or click Help to view the [SUPPORT_SITE].
     <url option="1" name="url">
-			https://www.firestormviewer.org/support/
+			https://wiki.avataresargentinos.com.ar
     </url>
     <form name="form">
       <button
@@ -9858,7 +9858,7 @@ Select residents to share with.
     icon="alert.tga"
     type="alert">
       [LABEL] failed to upload: [MESSAGE]
-[DETAILS] See Firestorm.log for details
+[DETAILS] See Puma.log for details
   </notification>
 
   <notification
@@ -9867,7 +9867,7 @@ Select residents to share with.
     type="alert">
       [LABEL] failed to upload: [MESSAGE]
 
-See Firestorm.log for details
+See Puma.log for details
   </notification>
    
   <notification
@@ -10068,7 +10068,7 @@ Please check your network and firewall setup.
 Disable any SIP ALG feature in your router.
 
 Voice communications will not be available.
-https://wiki.firestormviewer.org/fs_voice
+https://wiki.avataresargentinos.com.ar
     <tag>voice</tag>
   <tag>fail</tag>
     <usetemplate
@@ -10085,7 +10085,7 @@ We're having trouble connecting to your voice server.
 
 Voice communications will not be available.
 Please check your network and firewall setup.
-[https://wiki.firestormviewer.org/fs_voice]
+[https://wiki.avataresargentinos.com.ar]
     <tag>voice</tag>
   <tag>fail</tag>
     <usetemplate
@@ -11160,27 +11160,7 @@ This will send the following information to the current IM session:
      yestext="OK"/>
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="FireStormReqInfo"
-   type="alertmodal">
-    [NAME] is requesting that you send them information about your [APP_NAME] setup.
-(This is the same information that can be found by going to Help->About [APP_NAME])
-[REASON]
-Would you like to send them this information?
-    <form name="form">
-      <button
-       index="0"
-       name="Yes"
-       text="Yes"/>
-      <button
-       index="1"
-       name="No"
-       text="No"/>
-    </form>
-  </notification>
-
-<!-- Firestorm Phantom -->
+<!-- Puma Phantom -->
 
   <notification
    icon="notifytip.tga"
@@ -11196,20 +11176,13 @@ Phantom mode on.
 Phantom mode off.
   </notification>
 
-  <notification
-   icon="notifytip.tga"
-   name="FlightAssistEnabled"
-   type="notifytip">
-Flight Assist is enabled
-  </notification>
+<!-- Puma Phantom -->
 
-<!-- Firestorm Phantom -->
-
-<!-- Firestorm Reset Settings -->
+<!-- Puma Reset Settings -->
   <notification
     icon="alertmodal.tga"
     label="Reset all settings"
-    name="FirestormClearSettingsPrompt"
+    name="PumaClearSettingsPrompt"
     type="alertmodal">
     Resetting all settings may be helpful if you are experiencing problems; however, you will need to redo any customizations you have made to the default configuration. 
 
@@ -11226,7 +11199,7 @@ Flight Assist is enabled
     type="alertmodal">
     Settings will be cleared after restarting [APP_NAME].
   </notification>
-<!-- Firestorm Reset Settings -->
+<!-- Puma Reset Settings -->
 
 <!-- AW: opensim -->
   <notification icon="alertmodal.tga"
@@ -11397,7 +11370,7 @@ Your viewer cache is currently empty. Please be aware that you may experience sl
    icon="alertmodal.tga"
    name="FirstJoinSupportGroup2"
    type="alertmodal">
-Welcome to the Phoenix/Firestorm Viewer Support Group!
+Welcome to the Puma Viewer Support Group!
 
 To make support easier, it is recommended to announce your viewer's version to the group. This information includes current viewer version, viewer skin, operating system and RLVa status. You can choose to display your viewer's version in front of any chat you send to the group. Our support members can give you more meaningful advice right away if they know the viewer version you are on.
 
@@ -11417,7 +11390,7 @@ Do you want to enable the automatic viewer version display?
        text="No"/>
       <ignore
 	   name="ignore"
-       text="The Phoenix/Firestorm Support Group was joined"
+       text="The Puma Support Group was joined"
        save_option="true" />
     </form>
 
@@ -14059,8 +14032,8 @@ This setting is intended for cases where VRAM detection is reporting incorrect v
    name="CurrencyURIOverrideReceived"
    type="alertmodal">
 This region has elected to specify a third-party currency portal. 
-Please note that currency purchases made through Firestorm Viewer are transactions between you (the user) and the provider(s) or seller(s) of the currency. 
-Neither Firestorm Viewer, the Phoenix Firestorm Viewer Project Inc., nor its team shall be liable for any cost or damage arising either directly or indirectly from any such transaction. 
+Please note that currency purchases made through Puma Viewer are transactions between you (the user) and the provider(s) or seller(s) of the currency. 
+Neither Puma Viewer, Avatares Argentinos, nor its team shall be liable for any cost or damage arising either directly or indirectly from any such transaction. 
 If you do not agree to these terms of use, then no financial transactions should be conducted using this viewer.
    <usetemplate
     ignoretext="When the region sets a new currency helper."
@@ -14570,9 +14543,9 @@ Bulk import of Windlights has finished.
    <unique combine = "cancel_old">
      <context>FSAOScriptedNotification</context>
    </unique>
-Firestorm Animation Overrider: [AO_MESSAGE]
+Puma Animation Overrider: [AO_MESSAGE]
    <usetemplate
-    ignoretext="Warn me when the Firestorm Animation Overrider gets accessed by a scripted object"
+    ignoretext="Warn me when the Puma Animation Overrider gets accessed by a scripted object"
     name="notifyignore"/>
   </notification>
   <notification
@@ -14644,7 +14617,7 @@ Some antivirus programs may mistakenly block parts of [APP_NAME], slowing down i
 
 For detailed instructions on how to whitelist [APP_NAME] - including a list of files and folders to exclude - please visit our guide:
 
-https://wiki.firestormviewer.org/antivirus_whitelisting
+https://wiki.avataresargentinos.com.ar
   </notification>
 
    <notification
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index e56b461f..61cd2b96 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -15,7 +15,7 @@
   </panel.string>
   <panel.string
     name="sign_up_url">
-    https://www.firestormviewer.org/join-secondlife/
+    https://ayudavirtual.org/unirseasl/
   </panel.string>
   <layout_stack
   follows="left|right|top"
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index 234ec377..f4d2c6e8 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -15,7 +15,7 @@
   </panel.string>
   <panel.string
     name="sign_up_url">
-    https://www.firestormviewer.org/join-secondlife/
+    https://ayudavirtual.org/unirseasl/
   </panel.string>
   <layout_stack
     follows="left|right|top|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index f1593ae5..8f4e868c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -10,7 +10,7 @@
  label="UI-Pref"
  name="Display panel">
 <tab_container
- label="Firestorm Prefs"
+ label="Puma Prefs"
  layout="topleft"
  follows="all"
  top="5"
@@ -580,7 +580,7 @@
          layout="topleft"
          left="5"
          name="FSDisableIMChiclets"
-         tool_tip="If checked, Firestorm will not show any group / IM chat chiclets (notifications envelope and sum of IMs will remain on the screen)."
+         tool_tip="If checked, Puma will not show any group / IM chat chiclets (notifications envelope and sum of IMs will remain on the screen)."
          top_pad="6"
          width="256" />
         <check_box
@@ -591,7 +591,7 @@
          layout="topleft"
          left="5"
          name="FSLegacyNotificationWell"
-         tool_tip="If checked, Firestorm will use the legacy list view to display stored notifications."
+         tool_tip="If checked, Puma will use the legacy list view to display stored notifications."
          top_pad="3"
          width="265" />
         <text
@@ -614,7 +614,7 @@
          layout="topleft"
          left="5"
          name="FSLegacyNotificationWellAutoResize"
-         tool_tip="If checked, Firestorm will always resize the Conversations and legacy Notifications lists automatically when items get added or removed."
+         tool_tip="If checked, Puma will always resize the Conversations and legacy Notifications lists automatically when items get added or removed."
          top_pad="3"
          width="450" />
         <check_box
@@ -766,7 +766,7 @@
 		 width="270"
 		 left="20"
 		 control_name="FSStatbarLegacyMeanPerSec"
-		 tool_tip="If enabled, Firestorm will use the legacy method of showing the period mean per second value in the traffic indicator instead of the current observed value"/>
+		 tool_tip="If enabled, Puma will use the legacy method of showing the period mean per second value in the traffic indicator instead of the current observed value"/>
 		<check_box
 		 enabled_control="ShowNetStats"
 		 top_pad="4"
@@ -786,7 +786,7 @@
 		 left="10"
 		 width="270"
 		 control_name="FSEnableVolumeControls"
-		 tool_tip="If checked, Firestorm will show media controls (volume, media, stream) in upper right corner of the screen. Useful, if skin already has its own controls."/>
+		 tool_tip="If checked, Puma will show media controls (volume, media, stream) in upper right corner of the screen. Useful, if skin already has its own controls."/>
 		<check_box
 		 top_pad="4"
 		 follows="left|top"
@@ -948,7 +948,7 @@
 		 label="Open avatar profile directly when clicking on its name"
 		 layout="topleft"
 		 name="FSInspectAvatarSlurlOpensProfile"
-		 tool_tip="If enabled, Firestorm will open the profile of an avatar directly when clicking on a link with its name"
+		 tool_tip="If enabled, Puma will open the profile of an avatar directly when clicking on a link with its name"
 		 initial_value="true"
 		 top_pad="6"
 		 left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 3a7ba992..87a9ce49 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -31,7 +31,7 @@
      control_name="ForceShowGrid"
      follows="top|left"
      height="15"
-     label="Allow login to other grids (Not all grids will support Firestorm)"
+     label="Allow login to other grids (Not all grids will support Puma)"
      layout="topleft"
      left="30"
      name="show_grid_selection_check"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index ccb26278..aae9fbbe 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -87,7 +87,7 @@
       height="16"
       control_name="FSGrowlWhenActive"
       name="notify_growl_always_checkbox"
-      label="Show Growl Notifications even when Firestorm is active"/>
+      label="Show Growl Notifications even when Puma is active"/>
     <check_box
       enabled_control="FSEnableGrowl"
       layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 41baf622..8b0ade78 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -11,7 +11,7 @@
  name="chat">
 
 <tab_container
- label="Firestorm Prefs"
+ label="Puma Prefs"
  layout="topleft"
  follows="all"
  top="5"
@@ -1233,7 +1233,7 @@
 		 height="18"
 		 name="FSShowMessageCountInWindowTitle"
 		 control_name="FSShowMessageCountInWindowTitle"
-		 label="Show number of unread IMs in Firestorm's window title"/>
+		 label="Show number of unread IMs in Puma's window title"/>
 
 		<check_box
 		 layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml b/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
index 318b01d5..919bfb10 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_crashreports.xml
@@ -10,7 +10,7 @@
  label="Crash Reports"
  name="crash_reports">
     <panel.string name="PrivacyPolicyUrl">
-        https://www.firestormviewer.org/privacy-policy
+        https://avataresargentinos.com.ar/politica-privacidad
     </panel.string>
     <check_box
      layout="topleft"
@@ -19,7 +19,7 @@
      top="30"
      width="250"
      height="16"
-     label="Send crash reports to firestormviewer.org"
+     label="Send crash reports to avataresargentinos.com.ar"
      name="checkSendCrashReports"
      enabled="false" />
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 366f59ef..3e82c7bc 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -536,7 +536,7 @@
          layout="topleft"
          left="196"
          name="Fullscreen Mode"
-         tool_tip="Run Firestorm in Fullscreen mode. A restart is required to change mode."
+         tool_tip="Run Puma in Fullscreen mode. A restart is required to change mode."
          top="60"
          width="280" />
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_grids.xml b/indra/newview/skins/default/xui/en/panel_preferences_grids.xml
new file mode 100644
index 00000000..ca680e29
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_grids.xml
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="all"
+ height="440"
+ layout="topleft"
+ left="1"
+ top="1"
+ width="540"
+ label="Opensim"
+ name="opensim_panel">
+<tab_container
+ label="Opensim"
+ layout="topleft"
+ follows="all"
+ top="5"
+ bottom="-1"
+ left="1"
+ right="-1"
+ name="tabs"
+ tab_min_width="50"
+ tab_position="top" >
+  <panel
+  border="false"
+  follows="all"
+  height="440"
+  layout="topleft"
+  left="0"
+  top="0"
+  width="540"
+  label="Grid Manager"
+  name="grid_management_panel">
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="12"
+      layout="topleft"
+      left="30"
+      name="add_grid_text"
+      top="12"
+      width="400">
+      Add new grid
+    </text>
+    <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="left|top"
+      font="SansSerif"
+      height="19"
+      layout="topleft"
+      left="50"
+      max_length_chars="4096"
+      name="add_grid"
+      top_pad="5"
+	  label="Enter a LoginURI"
+      width="270" />
+    <button
+      follows="left|top"
+      height="19"
+      label="Clear"
+      label_selected="Clear"
+      layout="topleft"
+      left_pad="2"
+      name="clear_grid"
+      top_delta="0"
+      width="50">
+      <button.commit_callback
+      function="Pref.ClearGrid" />
+    </button>
+    <button
+      follows="left|top"
+      height="19"
+      label="Apply"
+      layout="topleft"
+      left_pad="2"
+      name="apply_new_grid"
+      top_delta="0"
+      width="50">
+      <button.commit_callback
+        function="Pref.AddGrid" />
+    </button>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="12"
+      layout="topleft"
+      left="30"
+      name="add_grid_text"
+      top_pad="10"
+      width="400">
+      Manage Grids
+    </text>
+    <scroll_list
+      height="125"
+      layout="topleft"
+      left="50"
+      name="grid_list"
+      draw_heading="true"
+      top="104"
+      width="370">
+        <scroll_list.columns
+          label="Grid name"
+          name="grid_label"
+          width="150" />
+        <scroll_list.columns
+          dynamic_width="true"
+          label="Login URI"
+          name="login_uri" />
+    </scroll_list>
+      <button
+      follows="left|top"
+      height="19"
+      label="Refresh"
+      layout="topleft"
+      left_pad="5"
+      name="refresh_grid"
+      top_delta="5"
+      width="75">
+      <button.commit_callback
+        function="Pref.RefreshGrid" />
+    </button>
+    <button
+      follows="left|top"
+      height="19"
+      label="Remove"
+      layout="topleft"
+      left_delta="0"
+      name="remove_grid"
+      top_pad="5"
+      width="75">
+      <button.commit_callback
+        function="Pref.RemoveGrid" />
+    </button>
+	  <panel
+		  border="true"
+		  follows="all"
+		  height="440"
+		  layout="topleft"
+		  left="0"
+		  top="210"
+		  width="540"
+		  label=""
+		  name="advanced_grid_panel">
+		  <text
+			  top="12"
+			  follows="left|top"
+			  layout="topleft"
+			  left="50"
+			  height="16"
+			  name="grid_name_text"
+			  width="130">
+			  Grid Name:
+		  </text>
+		  <line_editor
+		  enabled_control="FSEditGrid"
+		  follows="left|top|right"
+		  height="16"
+		  layout="topleft"
+		  left_pad="5"
+		  name="name_edit"
+		  top_delta="0"
+		  width="300" />
+		  <check_box
+			visible="false"
+			control_name="FSEditGrid"
+			height="16"
+			label=""
+			follows="left|top"
+			layout="topleft"
+			left_pad="4"
+			name="enable_lock"
+			width="16" />
+		  <icon
+		  visible="false"
+		  height="14"
+		  image_name="Locked_Icon"
+		  follows="left|top"
+		  layout="topleft"
+		  left_pad="2"
+		  top_delta="-2"
+		  mouse_opaque="true"
+		  name="lock"
+		  width="10" />
+		  <text
+			  top_pad="6"
+			  follows="left|top"
+			  layout="topleft"
+			  left="50"
+			  height="16"
+			  name="grid_uri_text"
+			  width="130">
+			  Grid URI:
+		  </text>
+		  <line_editor
+		  enabled_control="FSEditGrid"
+		  follows="left|top|right"
+		  height="16"
+		  layout="topleft"
+		  left_pad="5"
+		  name="grid_uri_edit"
+		  top_delta="0"
+		  width="300" />
+		  <text
+			  top_pad="2"
+			  follows="left|top"
+			  layout="topleft"
+			  left="50"
+			  height="16"
+			  name="login_page_text"
+			  width="130">
+			  Login Page:
+		  </text>
+		  <line_editor
+		  enabled_control="FSEditGrid"
+		  follows="left|top|right"
+		  height="16"
+		  layout="topleft"
+		  left_pad="5"
+		  name="login_page_edit"
+		  top_delta="0"
+		  width="300" />
+		  <text
+			  top_pad="2"
+			  follows="left|top"
+			  layout="topleft"
+			  left="50"
+			  height="16"
+			  name="helper_uri_text"
+			  width="130">
+			  Helper URI:
+		  </text>
+		  <line_editor
+		  enabled_control="FSEditGrid"
+		  follows="left|top|right"
+		  height="16"
+		  layout="topleft"
+		  left_pad="5"
+		  name="helper_uri_edit"
+		  top_delta="0"
+		  width="300" />
+		  <text
+			  top_pad="2"
+			  follows="left|top"
+			  layout="topleft"
+			  left="50"
+			  height="16"
+			  name="website_text"
+			  width="130">
+			  Grid Website:
+		  </text>
+		  <line_editor
+		  enabled_control="FSEditGrid"
+		  follows="left|top|right"
+		  height="16"
+		  layout="topleft"
+		  left_pad="5"
+		  name="website_edit"
+		  top_delta="0"
+		  width="300" />
+		  <text
+			  top_pad="2"
+			  follows="left|top"
+			  layout="topleft"
+			  left="50"
+			  height="16"
+			  name="support_text"
+			  width="130">
+			  Grid Support:
+		  </text>
+		  <line_editor
+		  enabled_control="FSEditGrid"
+		  follows="left|top|right"
+		  height="16"
+		  layout="topleft"
+		  left_pad="5"
+		  name="support_edit"
+		  top_delta="0"
+		  width="300" />
+		  <text
+			  top_pad="2"
+			  follows="left|top"
+			  layout="topleft"
+			  left="50"
+			  height="16"
+			  name="register_text"
+			  width="130">
+			  Grid Registration:
+		  </text>
+		  <line_editor
+		  enabled_control="FSEditGrid"
+		  follows="left|top|right"
+		  height="16"
+		  layout="topleft"
+		  left_pad="5"
+		  name="register_edit"
+		  top_delta="0"
+		  width="300" />
+		  <text
+			  top_pad="2"
+			  follows="left|top"
+			  layout="topleft"
+			  left="50"
+			  height="16"
+			  name="password_text"
+			  width="130">
+			  Grid Password URI:
+		  </text>
+		  <line_editor
+		  enabled_control="FSEditGrid"
+		  follows="left|top|right"
+		  height="16"
+		  layout="topleft"
+		  left_pad="5"
+		  name="password_edit"
+		  top_delta="0"
+		  width="300" />
+		  <text
+			  top_pad="2"
+			  follows="left|top"
+			  layout="topleft"
+			  left="50"
+			  height="16"
+			  name="search_text"
+			  width="130">
+			  Grid Search:
+		  </text>
+		  <line_editor
+		  enabled_control="FSEditGrid"
+		  follows="left|top|right"
+		  height="16"
+		  layout="topleft"
+		  left_pad="5"
+		  name="search_edit"
+		  top_delta="0"
+		  width="300" />
+		  <text
+			  top_pad="2"
+			  follows="left|top"
+			  layout="topleft"
+			  left="50"
+			  height="16"
+			  name="message_text"
+			  width="130">
+			  Grid Message URI:
+		  </text>
+		  <line_editor
+		  enabled_control="FSEditGrid"
+		  follows="left|top|right"
+		  height="16"
+		  layout="topleft"
+		  left_pad="5"
+		  name="message_edit"
+		  top_delta="0"
+		  width="300" />
+	  </panel>
+  </panel>
+  <panel
+	border="false"
+	follows="all"
+	height="440"
+	layout="topleft"
+	left="0"
+	top="0"
+	width="540"
+	label="Miscellaneous"
+	name="opensim_misc_panel">
+	  <check_box
+      control_name="DebugSearch"
+      height="16"
+      initial_value="false"
+      label="Debug Search"
+      layout="topleft"
+      left="30"
+      name="DebugSearch"
+      top="12"
+      width="256" />
+	  <text
+		  type="string"
+		  length="1"
+		  follows="left|top"
+		  height="12"
+		  layout="topleft"
+		  left="50"
+		  name="search_url_debug_text"
+		  top_pad="5"
+		  width="400">
+		  Override current search url: (no override if empty)
+	  </text>
+	  <line_editor
+      control_name="SearchURLDebug"
+      enabled_control="DebugSearch"
+      border_style="line"
+      border_thickness="1"
+      follows="left|top"
+      font="SansSerif"
+      height="19"
+      layout="topleft"
+      left="50"
+      max_length_chars="4096"
+      name="search_url_debug"
+      top_pad="5"
+      width="270" />
+	  <button
+		  enabled_control="DebugSearch"
+		  follows="left|top"
+		  height="19"
+		  label="Clear"
+		  label_selected="Clear"
+		  layout="topleft"
+		  left_pad="2"
+		  name="clear_search_url_debug"
+		  top_delta="0"
+		  width="50">
+		  <button.commit_callback
+		  function="Pref.ClearDebugSearchURL" />
+	  </button>
+	  <button
+		  enabled_control="DebugSearch"
+		  follows="left|top"
+		  height="19"
+		  label="Pick"
+		  layout="topleft"
+		  left_pad="2"
+		  name="pick_current_search_url"
+		  top_delta="0"
+		  width="50">
+		  <button.commit_callback
+		  function="Pref.PickDebugSearchURL" />
+	  </button>
+  </panel>
+</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_puma.xml b/indra/newview/skins/default/xui/en/panel_preferences_puma.xml
new file mode 100644
index 00000000..88dd69b4
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_puma.xml
@@ -0,0 +1,1776 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="all"
+ height="440"
+ layout="topleft"
+ left="1"
+ top="1"
+ width="540"
+ label="Puma"
+ name="puma">
+ 
+<panel.string name="BeamsOffLabel">
+	=== OFF ===
+</panel.string>
+	<string name="EmbeddedItemNotSet">
+		Not set
+	</string>
+	<string name="EmbeddedItemNotAvailable">
+		Not available
+	</string>
+	<string name="EmbeddedItemNotLoggedIn">
+		Not logged in
+	</string>
+
+<tab_container
+ label="Puma Prefs"
+ layout="topleft"
+ follows="all"
+ top="5"
+ bottom="-1"
+ left="1"
+ right="-1"
+ name="tabs"
+ tab_min_width="50"
+ tab_position="top" >
+
+    <!--Extras-->
+    <panel
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="Extras"
+     name="tab-extras" >
+        <check_box
+         control_name="RestrainedLove"
+         layout="topleft"
+         follows="left|top"
+         top_pad="6"
+         left="10"
+         width="270"
+         height="20"
+         name="checkMiscRLVa"
+         label="Allow Remote Scripted Viewer Controls  (RLVa)"/>
+        <text
+         layout="topleft"
+         follows="left|top"
+         left_pad="5"
+         height="16"
+         width="150"
+         name="textMiscRLVaRestart"
+         text_color="White_25">
+            (requires restart)
+        </text>
+        <check_box
+         top_pad="3"
+         left="10"
+         follows="left|top"
+         height="16"
+         label="Always rez objects under the land group if possible"
+         name="grouplandrez"
+         width="270"
+         control_name="RezUnderLandGroup"
+         tool_tip="Attempts to rez objects under the land group if you're in the land group regardless of which current group tag you're wearing."/>
+		<check_box
+		 control_name="EffectScriptChatParticles"
+		 height="16"
+		 label="Create particle effects when scripts communicate"
+		 layout="topleft"
+		 name="EffectScriptChatParticles"
+		 tool_tip="If enabled scripted objects display swirling particle lights when the scripts communicate"
+		 initial_value="true"
+		 top_pad="3"
+		 width="350" />
+        <check_box
+         top_pad="3"
+         follows="left|top"
+         height="16"
+         label="Deactivate tracking beacon when reaching the targeted avatar (&lt;= 3m)"
+         name="FSDisableAvatarTrackerAtCloseIn"
+         width="270"
+         control_name="FSDisableAvatarTrackerAtCloseIn"
+         tool_tip="If enabled, the tracking beacon will be disabled automatically, if the distance to the targeted avatar is less than 3m. (Default)"/>
+        <check_box
+         top_pad="3"
+         follows="left|top"
+         height="16"
+         label="Fix Bento Idle Animation"
+         name="play_default_bento_idle_animation_toggle"
+         tool_tip="If enabled, the viewer will run a default, priority 0 bento animation that poses hands, wings, mouth and tail in a natural position when no other bento animation is running."
+         width="270"
+         control_name="FSPlayDefaultBentoAnimation"/>
+        <check_box
+         top_pad="10"
+         follows="left|top"
+         height="16"
+         label="Disable Login Progress Screen"
+         name="login_screen_toggle"
+         width="270"
+         control_name="FSDisableLoginScreens"
+         tool_tip="Disables the black login progress Screen"/>
+        <check_box
+         top_pad="3"
+         follows="left|top"
+         height="16"
+         label="Disable Logout Progress Screen"
+         name="logout_screen_toggle"
+         width="270"
+         control_name="FSDisableLogoutScreens"
+         tool_tip="Disables the black Logout progress screen."/>
+
+		<check_box
+		 control_name="FSRenderFarClipStepping"
+		 height="16"
+		 label="Enable progressive draw distance stepping"
+		 layout="topleft"
+		 name="FSRenderFarClipStepping"
+		 tool_tip="If enabled, Puma will use a progressive draw distance stepping after teleporting."
+		 initial_value="true"
+		 top_pad="10"
+		 width="250" />
+		<slider
+		 name="progressive_draw_distance_interval"
+		 control_name="FSRenderFarClipSteppingInterval"
+		 enabled_control="FSRenderFarClipStepping"
+		 decimal_digits="0"
+		 left="10"
+		 top_pad="2"
+		 follows="left|top"
+		 layout="topleft"
+		 height="18"
+		 increment="1"
+		 initial_value="20"
+		 max_val="30"
+		 min_val="5"
+		 width="225"
+		 tool_tip="Interval in seconds between each draw distance increment"/>
+
+        <slider
+         name="manual_environment_change_transition_period"
+         control_name="FSEnvironmentManualTransitionTime"
+         label="Environment Transition Time:"
+         decimal_digits="1"
+         left="12"
+         top_pad="15"
+         follows="left|top"
+         layout="topleft"
+         height="18"
+         increment="0.5"
+         initial_value="0"
+         max_val="60"
+         min_val="0"
+         width="520"
+         tool_tip="Interval in seconds over which manual environment changes will blend. Zero is instant."/>
+        <check_box
+         top_pad="5"
+         control_name="EnvironmentPersistAcrossLogin"
+         follows="left|top"
+         height="16"
+         initial_value="true"
+         name="EnvironmentPersistAcrossLogin"
+         label="Persist Environment settings throughout sessions"
+         left="10"
+         width="500"
+         tool_tip="Restores the current environment settings after next login."/>
+        <check_box
+         top_pad="5"
+         control_name="FSRepeatedEnvTogglesShared"
+         follows="left|top"
+         height="16"
+         initial_value="true"
+         name="FSRepeatedEnvTogglesShared"
+         label="Repeated environment keybinds revert to shared environment"
+         left="10"
+         width="500"
+         tool_tip="Causes repeated keybinds (e.g. ctrl+shift+y) to alternate between the requested preset &amp; shared environment"/>
+    </panel>
+
+
+    <!--Protection-->
+    <panel
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="Protection"
+     name="ProtectionTab">
+        <check_box
+         top_pad="10"
+         left="10"
+         label="Block left-click sitting on objects"
+         control_name="FSBlockClickSit"
+         follows="left|top"
+         height="16"
+         name="FSBlockClickSit"
+         width="256" />
+        <check_box
+         top_pad="4"
+         label="Allow scripts to show map UI (llMapDestination)"
+         control_name="ScriptsCanShowUI"
+         follows="left|top"
+         height="16"
+         name="ScriptsCanShowUI"
+         width="256" />
+
+        <text
+         top_pad="5"
+         follows="left|top"
+         height="12"
+         name="revokepermissions_txt"
+         width="200">
+         Revoke Permissions:
+         </text>
+        <radio_group
+         top_pad="5"
+         left="20"
+         height="62"
+         layout="topleft"
+         control_name="FSRevokePerms"
+         name="FSRevokePerms"
+         tool_tip=""
+         width="331">
+            <radio_item
+             height="16"
+             label="Never (Original behaviour)"
+             layout="topleft"
+             name="never_radio"
+             value="0"
+             top_pad="0"
+             width="150" />
+            <radio_item
+             height="16"
+             label="Revoke on SIT"
+             layout="topleft"
+             top_pad="0"
+             name="sit_radio"
+             value="1"
+             width="150" />
+            <radio_item
+             height="16"
+             label="Revoke on STAND"
+             layout="topleft"
+             top_pad="0"
+             name="stand_radio"
+             value="2"
+             width="150" />
+            <radio_item
+             height="16"
+             label="Revoke on SIT and STAND"
+             layout="topleft"
+             top_pad="0"
+             name="sitnstand_radio"
+             value="3"
+             width="150" />
+        </radio_group>
+
+        <text
+         left="10"
+         top_pad="5"
+         follows="left|top"
+         height="12"
+         name="SurfaceAreaThreshholdLabel"
+         width="360">
+         Texture Lag Protection (may break some objects):
+         </text>
+        <check_box
+         top_pad="8"
+         left="20"
+         label="Automatically hide large objects with high texture area. Threshold: "
+         control_name="RenderVolumeSAProtection"
+         follows="left|top"
+         height="16"
+         name="RenderVolumeSAProtection"
+         width="380"
+         tool_tip="This protects you from objects with very large textures over large surface areas often designed to crash the viewer. Default is 5000 square meters, but if you find that some objects are not rendering and this option is enabled you may need to increase it."/>
+        <spinner
+         enabled_control="RenderVolumeSAProtection"
+         top_delta="-5"
+         control_name="RenderVolumeSAFrameMax"
+         decimal_digits="0"
+         layout="topleft"
+         follows="left|top"
+         height="18"
+         left_pad="5"
+         increment="1"
+         initial_value="5000"
+         max_val="10000"
+         min_val="500"
+         name="RenderVolumeSAFrameMax"
+         width="90" />
+
+        <check_box
+         top_pad="10"
+         left="10"
+         label="Enable Spam Protection"
+         control_name="UseAntiSpam"
+         follows="left|top"
+         height="16"
+         name="UseAntiSpam"
+         width="200" />
+        <!-- FS:TS FIRE-23138: Enable spam protection for user's objects -->
+        <check_box
+         left="20"
+         label="Enable Spam Protection even for objects owned by you"
+         control_name="FSUseAntiSpamMine"
+         enabled_control="UseAntiSpam"
+         follows="left|top"
+         height="16"
+         name="FSUseAntiSpamMine"
+         width="380"
+         tool_tip="This will apply antispam protection even to objects you own."/>
+        <!-- /FS:TS FIRE-23138 -->
+        <text
+         top_pad="5"
+         type="string"
+         length="1"
+         follows="left|top"
+         height="15"
+         layout="topleft"
+         left="30"
+         name="AntiSpamText1"
+         width="200">
+           Max lines in a single message:
+        </text>
+        <spinner
+         enabled_control="UseAntiSpam"
+         top_delta="-5"
+         control_name="_NACL_AntiSpamNewlines"
+         decimal_digits="0"
+         layout="topleft"
+         follows="left|top"
+         height="18"
+         left_pad="0"
+         increment="1"
+         initial_value="70"
+         max_val="1000"
+         min_val="5"
+         name="_NACL_AntiSpamNewlines"
+         width="50"
+         tool_tip="Maximum number of lines to accept in a single text message [Default: 70]"/>
+        <text
+         top_pad="10"
+         type="string"
+         length="1"
+         follows="left|top"
+         height="15"
+         layout="topleft"
+         left="30"
+         name="AntiSpamText2"
+         width="200">
+           Max events from same source:
+        </text>
+        <spinner
+         enabled_control="UseAntiSpam"
+         top_delta="-5"
+         control_name="_NACL_AntiSpamAmount"
+         decimal_digits="0"
+         layout="topleft"
+         follows="left|top"
+         height="18"
+         left_pad="0"
+         increment="1"
+         initial_value="10"
+         max_val="40"
+         min_val="2"
+         name="_NACL_AntiSpamAmount"
+         width="50"
+         tool_tip="Maximum number of similar events to accept within 2 seconds from the same source [Default: 10]"/>
+        <text
+         top_pad="10"
+         type="string"
+         length="1"
+         follows="left|top"
+         height="15"
+         layout="topleft"
+         left="30"
+         name="AntiSpamText3"
+         width="200">
+           Sound play requests multiplier:
+        </text>
+        <spinner
+         enabled_control="UseAntiSpam"
+         top_delta="-5"
+         control_name="_NACL_AntiSpamSoundMulti"
+         decimal_digits="0"
+         layout="topleft"
+         follows="left|top"
+         height="18"
+         left_pad="0"
+         increment="1"
+         initial_value="10"
+         max_val="25"
+         min_val="1"
+         name="_NACL_AntiSpamSoundMulti"
+         width="50"
+         tool_tip="Event multiplier for sound play requests [Default: 10]"/>
+        <text
+         top_pad="10"
+         type="string"
+         length="1"
+         follows="left|top"
+         height="15"
+         layout="topleft"
+         left="30"
+         name="AntiSpamText4"
+         width="200">
+           Sound preload requests multiplier:
+        </text>
+        <spinner
+         enabled_control="UseAntiSpam"
+         top_delta="-5"
+         control_name="_NACL_AntiSpamSoundPreloadMulti"
+         decimal_digits="0"
+         layout="topleft"
+         follows="left|top"
+         height="18"
+         left_pad="0"
+         increment="1"
+         initial_value="4"
+         max_val="25"
+         min_val="1"
+         name="_NACL_AntiSpamSoundPreloadMulti"
+         width="50"
+         tool_tip="Event multiplier for sound preload requests [Default: 4]"/>
+        <button
+         enabled_control="UseAntiSpam"
+         layout="topleft"
+         follows="left|top"
+         top_pad="10"
+         width="200"
+         height="20"
+         left="40"
+         name="AntiSpamUnblock"
+         label="Unblock all spam sources"
+         commit_callback.function="NACL.AntiSpamUnblock"/>
+
+        <check_box
+         top_pad="8"
+         left="10"
+         label="Confirm before paying. Threshold:"
+         control_name="FSConfirmPayments"
+         follows="left|top"
+         height="16"
+         name="FSConfirmPayments"
+         width="205"
+         tool_tip="Show a confirmation dialog before paying sums greater than the threshold. To always show a confirmation, set the threshold to 0."/>
+        <spinner
+         enabled_control="FSConfirmPayments"
+         top_delta="-5"
+         control_name="FSPaymentConfirmationThreshold"
+         decimal_digits="0"
+         layout="topleft"
+         follows="left|top"
+         height="18"
+         left_pad="5"
+         increment="1"
+         initial_value="200"
+         max_val="2147483647"
+         min_val="0"
+         name="FSPaymentConfirmationThreshold"
+         tool_tip="Show a confirmation dialog before paying sums greater than the threshold. To always show a confirmation, set the threshold to 0."
+         width="100"/>
+    </panel>
+
+
+    <!--Avatar-->
+    <panel
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="Avatar"
+     name="puma_avatar" >
+
+        <text
+         type="string"
+         left="5"
+         top_pad="12"
+         length="1"
+         follows="left|top"
+         height="12"
+         layout="topleft"
+         name="HeadMovement"
+         width="500">
+            Amount that Avatar's head Follows Mouse (set to '0' for no movement):
+        </text>
+        <slider
+         control_name="PitchFromMousePosition"
+         decimal_digits="0"
+         follows="left|top"
+         height="16"
+         increment="15"
+         label="Vertical range that avatar's head follows mouse:"
+         tool_tip="Vertical range that avatar's head follows mouse (pitch) in degrees"
+         label_width="300"
+         layout="topleft"
+         left="15"
+         min_val="0"
+         max_val="120"
+         name="PitchFromMousePositionSlider"
+         top_pad="10"
+         width="471" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="16"
+         layout="topleft"
+         left="485"
+         name="PitchFromMousePositionText"
+         top_delta="0"
+         width="50">
+            degrees
+        </text>
+        <slider
+         control_name="YawFromMousePosition"
+         decimal_digits="0"
+         follows="left|top"
+         height="16"
+         increment="5"
+         label="Horizontal range that avatar's head follows mouse:"
+         tool_tip="Horizontal range that avatar's head follows mouse (yaw) in degrees"
+         label_width="300"
+         layout="topleft"
+         left="15"
+         min_val="0"
+         max_val="120"
+         name="YawFromMousePositionSlider"
+         top_pad="5"
+         width="471" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="16"
+         layout="topleft"
+         left="485"
+         name="YawFromMousePositionText"
+         top_delta="0"
+         width="50">
+            degrees
+        </text>
+        <text
+         top_pad="5"
+         left="15"
+         name="note_lookat"
+         follows="left|top"
+         layout="topleft"
+         text_color="White_50"
+         height="12"
+         width="500">
+             (Avatar look at target settings are on the Privacy tab.)
+        </text>
+
+        <check_box
+         top_pad="10"
+         enabled="false"
+         follows="left|top"
+         height="16"
+         label="Disable random avatar eye movements"
+         left="15"
+         name="FSStaticEyes"
+         width="250"
+         control_name="FSStaticEyes"/>
+
+        <!-- LGG Color Beams -->
+        <text
+         name="BeamPrefs"
+         follows="left|top"
+         left="15"
+         bottom_delta="25" >
+            Selection beam particle effects
+        </text>
+        <view_border
+         bevel_style="none"
+         border_thickness="1"
+         top_delta="15"
+         follows="top|left"
+         height="0"
+         left="15"
+         name="BeamDivisor"
+         width="490" />
+
+        <button
+         enabled_control="ShowSelectionBeam"
+         name="BeamColor_delete"
+         label="Delete"
+         tool_tip="Remove this preset"
+         left="15"
+         top_delta="10"
+         width="55"
+         height="20"
+         follows="left|top" />
+
+        <combo_box
+         enabled_control="ShowSelectionBeam"
+         allow_text_entry="false"
+         top_delta="0"
+         left_delta="60"
+         follows="left|top"
+         height="20"
+         max_chars="20"
+         name="BeamColor_combo"
+         width="170"
+         control_name="FSBeamColorFile"
+         tool_tip="Select the color preset for the selection beam"/>
+
+        <button
+         enabled_control="ShowSelectionBeam"
+         name="BeamColor_new"
+         label="Create New"
+         tool_tip="Create a new color preset"
+         left="15"
+         bottom_delta="25"
+         width="80"
+         height="20"
+         follows="left|top" />
+
+        <button
+         enabled_control="ShowSelectionBeam"
+         name="BeamColor_refresh"
+         label="Refresh List"
+         tool_tip="Refresh the preset list"
+         left="15"
+         bottom_delta="25"
+         width="80"
+         height="20"
+         follows="left|top" />
+
+        <button
+         enabled_control="ShowSelectionBeam"
+         left="100"
+         top_delta="-25"
+         follows="left|top"
+         width="130"
+         height="80"
+         name="PhoenixBeamPrev_rainbow"
+         label=""
+         scale_image="true"
+         image_color="SL-White"
+         image_color_disabled="SL-White"
+         image_selected="beam_rainbow.png"
+         image_unselected="beam_rainbow.png"
+         image_hover_selected="beam_rainbow.png"
+         image_hover_unselected="beam_rainbow.png" />
+
+        <slider
+         enabled_control="ShowSelectionBeam"
+         bottom_delta="25"
+         left="15"
+         name="FSMaxBeamsPerSecond"
+         control_name="FSMaxBeamsPerSecond"
+         decimal_digits="0"
+         enabled="true"
+         follows="left|top"
+         height="18"
+         increment="1"
+         initial_value="4"
+         label="Beam updates/sec:"
+         label_width="100"
+         max_val="200"
+         min_val="4"
+         show_text="true"
+         width="250"
+         tool_tip="How many beam updates to send in a second. Default 40" />
+
+        <check_box
+         bottom_delta="18"
+         enabled="true"
+         follows="left|top"
+         height="16"
+         initial_value="true"
+         label="Enable selection beam"
+         left="15"
+         name="SLPartBeam"
+         width="250"
+         tool_tip="Disabling this setting will prevent selection beams from being rendered locally. It does not prevent selection beams being sent to other avatars. If you do not wish to show your selection, you can disable that via Preferences -&gt; Privacy -&gt; LookAt -&gt; Don't send my selection target hints."
+         control_name="ShowSelectionBeam" />
+
+        <check_box
+         bottom_delta="18"
+         enabled="true"
+         follows="left|top"
+         height="16"
+         initial_value="true"
+         label="Send selection data to chat"
+         left="15"
+         name="FSParticleChat"
+         tool_tip="Sends selection data (selection start/stop and global position) to chat channel 9000."
+         width="250"
+         control_name="FSParticleChat" />
+
+        <view_border
+         bevel_style="none"
+         border_thickness="1"
+         top_delta="-160"
+         follows="top|left"
+         height="180"
+         left="260"
+         name="BeamDivisor2"
+         width="0" />
+
+        <combo_box
+         enabled_control="ShowSelectionBeam"
+         allow_text_entry="false"
+         bottom_delta="-150"
+         left="275"
+         follows="left|top"
+         height="20"
+         max_chars="20"
+         name="FSBeamShape_combo"
+         width="170"
+         control_name="FSBeamShape"
+         tool_tip="Select the shape for the particle beam" />
+
+        <button
+         enabled_control="ShowSelectionBeam"
+         name="delete_beam"
+         label="Delete"
+         tool_tip="Remove this beam"
+         left_delta="175"
+         bottom_delta="0"
+         width="55"
+         height="20"
+         follows="left|top" />
+
+        <button
+         enabled_control="ShowSelectionBeam"
+         name="custom_beam_btn"
+         label="Create New"
+         tool_tip="Customize the beam shape"
+         left_delta="-20"
+         bottom_delta="25"
+         width="80"
+         height="20"
+         follows="left|top"/>
+
+        <button
+         enabled_control="ShowSelectionBeam"
+         name="refresh_beams"
+         label="Refresh List"
+         tool_tip="Refresh the beam list"
+         left_delta="0"
+         bottom_delta="25"
+         width="80"
+         height="20"
+         follows="left|top" />
+
+        <button
+         enabled_control="ShowSelectionBeam"
+         left="290"
+         top_delta="-25"
+         follows="left|top"
+         width="130"
+         height="80"
+         name="PhoenixBeamPrev_Phoenix"
+         label=""
+         image_color="SL-White"
+         image_color_disabled="SL-White"
+         scale_image="true"
+         image_selected="beam_phoenix.png"
+         image_unselected="beam_phoenix.png"
+         image_hover_selected="beam_phoenix.png"
+         image_hover_unselected="beam_phoenix.png" />
+
+        <slider
+         enabled_control="ShowSelectionBeam"
+         bottom_delta="25"
+         left_delta="-15"
+         name="FSBeamShapeScale"
+         control_name="FSBeamShapeScale"
+         decimal_digits="1"
+         enabled="true"
+         follows="left|top"
+         height="18"
+         increment="0.1"
+         initial_value="1"
+         label="Scale:"
+         label_width="35"
+         max_val="4"
+         min_val="0.1"
+         show_text="true"
+         width="150"
+         tool_tip="Change the scale of the shape used for the Phoenix Shaped Beam" />
+
+        <text
+         type="string"
+         left="5"
+         top_pad="65"
+         length="1"
+         follows="left|top"
+         height="12"
+         layout="topleft"
+         name="BridgeProtocols"
+         width="500">
+            LSL-Client Bridge external protocols integration:
+        </text>
+
+    </panel>
+
+    <!--Build 1-->
+    <panel
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="Build 1"
+     name="BuildTab">
+     
+        <text
+         top="5"
+         follows="left|top|right"
+         height="10"
+         left="20"
+         name="text_box_objprams"
+         width="175">
+         Default Object Size
+        </text>
+        <text
+         top="5"
+         follows="left|top|right"
+         height="10"
+         left="180"
+         name="text_box_objprams2"
+         width="175">
+         Settings
+        </text>
+        <text
+         top="5"
+         follows="left|top|right"
+         height="10"
+         left="350"
+         name="text_box_objprams3"
+         width="175">
+         Texture
+        </text>
+        <view_border
+         top_pad="5"
+         left="5"
+         height="90"
+         follows="top|left"
+         bevel_style="none"
+         border_thickness="1"
+         name="SizeBorder"
+         width="140"/>
+        <view_border
+         top_delta="0"
+         left_delta="140"
+         height="90"
+         follows="top|left"
+         bevel_style="none"
+         border_thickness="1"
+         name="SettingBorder"
+         width="120"/>
+        <view_border
+         top_delta="0"
+         left_delta="120"
+         height="90"
+         follows="top|left"
+         bevel_style="none"
+         border_thickness="1"
+         name="TextureBorder"
+         width="255"/>
+         
+        <spinner
+         top_pad="-77"
+         left="15"
+         decimal_digits="5"
+         follows="left|top"
+         height="16"
+         increment="0.05"
+         label="X size"
+         label_width="40"
+         max_val="10"
+         min_val="0.01"
+         name="X size"
+         width="120"
+         control_name="FSBuildPrefs_Xsize"/>
+        <spinner
+         top_pad="7"
+         decimal_digits="5"
+         follows="left|top"
+         height="16"
+         increment="0.05"
+         label="Y size"
+         label_width="40"
+         max_val="10"
+         min_val="0.01"
+         name="Y size"
+         width="120"
+         control_name="FSBuildPrefs_Ysize"/>
+        <spinner
+         top_pad="7"
+         decimal_digits="5"
+         follows="left|top"
+         height="16"
+         increment="0.05"
+         label="Z size"
+         label_width="40"
+         max_val="10"
+         min_val="0.01"
+         name="Z size"
+         width="120"
+         control_name="FSBuildPrefs_Zsize"/>
+
+        <check_box
+         top_delta="-50"
+         enabled="true"
+         follows="left|top"
+         font="SansSerifSmall"
+         height="16"
+         label="Phantom"
+         left="155"
+         mouse_opaque="true"
+         name="FSBuildPrefs_PhantomToggle"
+         radio_style="false"
+         width="100"
+         control_name="FSBuildPrefs_Phantom"/>
+        <check_box
+         top_delta="20"
+         enabled="true"
+         follows="left|top"
+         font="SansSerifSmall"
+         height="16"
+         label="Physical"
+         left_delta="0"
+         mouse_opaque="true"
+         name="FSBuildPrefs_PhysicalToggle"
+         radio_style="false"
+         width="100"
+         control_name="FSBuildPrefs_Physical"/>
+        <check_box
+         top_delta="20"
+         enabled="true"
+         follows="left|top"
+         font="SansSerifSmall"
+         height="16"
+         label="Temporary"
+         left_delta="0"
+         mouse_opaque="true"
+         name="FSBuildPrefs_TemporaryToggle"
+         radio_style="false"
+         width="100"
+         control_name="FSBuildPrefs_Temporary"/>
+        <combo_box
+         allow_text_entry="false"
+         top_delta="20"
+         left_delta="1"
+         follows="left|top"
+         height="18"
+         max_chars="20"
+         mouse_opaque="true"
+         name="material"
+         width="87"
+         control_name="FSBuildPrefs_Material">
+             <combo_item name="Stone" value="Stone" label="Stone"/>
+             <combo_item name="Metal" value="Metal" label="Metal"/>
+             <combo_item name="Glass" value="Glass" label="Glass"/>
+             <combo_item name="Wood" value="Wood" label="Wood"/>
+             <combo_item name="Flesh" value="Flesh" label="Flesh"/>
+             <combo_item name="Plastic" value="Plastic" label="Plastic"/>
+             <combo_item name="Rubber" value="Rubber" label="Rubber"/>
+        </combo_box>
+
+        <texture_picker
+         allow_no_texture="false"
+         top_delta="-60"
+         can_apply_immediately="true"
+         default_image_name="Default"
+         follows="left|top"
+         height="80"
+         label="Texture"
+         left="275"
+         mouse_opaque="true"
+         name="texture control"
+         control_name="FSDefaultObjectTexture"
+         tool_tip="Click to choose a picture"
+         width="64"/>
+        <color_swatch
+         border_color="0.45098, 0.517647, 0.607843, 1"
+         top_delta="0"
+         can_apply_immediately="true"
+         color="1, 1, 1, 1"
+         follows="left|top"
+         height="80"
+         label="Color"
+         left_delta="75"
+         mouse_opaque="true"
+         name="colorswatch"
+         tool_tip="Click to open Color Picker"
+         width="64"
+         control_name="FSBuildPrefs_Color"/>
+        <spinner
+         top_delta="0"
+         decimal_digits="0"
+         follows="left|top"
+         height="16"
+         increment="1"
+         label="Alpha"
+         label_width="40"
+         left_delta="70"
+         max_val="100"
+         min_val="0"
+         mouse_opaque="true"
+         name="alpha"
+         width="90"
+         control_name="FSBuildPrefs_Alpha"/>
+        <spinner
+         top_delta="20"
+         enabled="true"
+         decimal_digits="2"
+         follows="left|top"
+         height="16"
+         increment="0.05"
+         label="Glow"
+         label_width="40"
+         left_delta="0"
+         max_val="1"
+         min_val="0"
+         mouse_opaque="true"
+         name="glow"
+         width="90"
+         control_name="FSBuildPrefs_Glow"/>
+        <check_box
+         top_delta="22"
+         enabled="true"
+         follows="left|top"
+         font="SansSerifSmall"
+         height="16"
+         label="Full Bright"
+         left_delta="0"
+         mouse_opaque="true"
+         name="EmFBToggle"
+         radio_style="false"
+         width="100"
+         control_name="FSBuildPrefs_FullBright"/>
+        <combo_box
+         allow_text_entry="false"
+         top_delta="18"
+         follows="left|top"
+         height="18"
+         left_delta="0"
+         max_chars="20"
+         mouse_opaque="true"
+         name="combobox shininess"
+         tool_tip="Set the amount of shine for the object"
+         width="90"
+         control_name="FSBuildPrefs_Shiny">
+          <combo_item name="None" value="None" label="None"/>
+          <combo_item name="Low" value="Low" label="Low"/>
+          <combo_item name="Medium" value="Medium" label="Medium"/>
+          <combo_item name="High" value="High" label="High"/>
+        </combo_box>
+        <check_box
+         name="FSBuildPrefs_EmbedItem"
+         top="120"
+         enabled="false"
+         follows="left|top"
+         font="SansSerifSmall"
+         height="16"
+         initial_value="false"
+         label="Embed an item into new prims"
+         left="10"
+         mouse_opaque="true"
+         control_name="FSBuildPrefs_EmbedItem"
+         radio_style="false"
+         width="270"/>
+        <view_border
+         bevel_style="in"
+         top_delta="20"
+         follows="left|top"
+         height="16"
+         left_delta="0"
+         mouse_opaque="false"
+         name="embed_item_drop_target_rect"
+         width="250"/>
+        <fs_embedded_item_drop_target
+         bg_visible="false"
+         border_visible="false"
+         top_delta="0"
+         follows="left|top"
+         font="SansSerifSmall"
+         h_pad="0"
+         halign="center"
+         height="16"
+         left_delta="0"
+         mouse_opaque="true"
+         name="embed_item"
+         tool_tip="Drop an inventory item here."
+         v_pad="2"
+         width="250">
+         Drop an inventory item here.
+        </fs_embedded_item_drop_target>
+        <view_border
+         bevel_style="in"
+         top_delta="18"
+         follows="left|top"
+         height="16"
+         left_delta="0"
+         mouse_opaque="false"
+         name="build_item_add_disp_rect"
+         width="250"/>
+        <text
+         bg_visible="false"
+         border_visible="false"
+         top_delta="0"
+         follows="left|top"
+         font="SansSerifSmall"
+         h_pad="0"
+         halign="center"
+         height="16"
+         left_delta="0"
+         mouse_opaque="true"
+         name="build_item_add_disp_rect_txt"
+         tool_tip=""
+         v_pad="2"
+         width="250">
+         Currently set to: [ITEM]
+        </text>
+        <text
+         top_pad="-60"
+         left_pad="125"
+         follows="left|top"
+         height="10"
+         name="text_box_pivotpoint"
+         width="135">
+          Pivot Point
+        </text>
+        <view_border
+         top_pad="5"
+         bevel_style="none"
+         border_thickness="1"
+         follows="top|left"
+         height="120"
+         name="PivotBorder"
+         width="135"/>
+        <check_box
+         top_delta="13"
+         left_delta="3"
+         follows="left|top"
+         label="Axis on 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="FSBuildPrefsActualRoot_toggle"
+         control_name="FSBuildPrefs_ActualRoot"/>
+        <spinner
+         top_pad="5"
+         left_delta="5"
+         decimal_digits="5"
+         follows="left|top"
+         height="16"
+         increment="0.05"
+         label="X pos"
+         label_width="40"
+         max_val="256"
+         min_val="-256"
+         name="X pos"
+         width="120"
+         control_name="FSBuildPrefs_PivotX"/>
+        <spinner
+         top_pad="7"
+         decimal_digits="5"
+         follows="left|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="FSBuildPrefs_PivotY"/>
+        <spinner
+         top_pad="7"
+         decimal_digits="5"
+         follows="left|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="FSBuildPrefs_PivotZ"/>
+        <check_box
+         top_pad="10"
+         left_delta="-3"
+         enabled="true"
+         follows="left|top"
+         height="16"
+         label="Values are percent"
+         tool_tip="Default settings are Percentages and every axis set at 50"
+         name="FSPivotPercToggle"
+         width="100"
+         control_name="FSBuildPrefs_PivotIsPercent"/>
+
+        <button
+         follows="left|top"
+         height="25"
+         label="Default Creation Permissions"
+         layout="topleft"
+         name="fs_default_creation_permissions"
+         left="8"
+         top="185"
+         width="250">
+         <button.commit_callback
+             function="Pref.PermsDefault" />
+        </button>
+
+        <text
+         top_pad="10"
+         left="8"
+         follows="left|top"
+         name="text_box_scripting_font"
+         width="100">
+          Script Editor Font:
+        </text>
+        <combo_box
+         allow_text_entry="false"
+         top_delta="-5"
+         left_pad="5"
+         follows="left|top"
+         max_chars="20"
+         mouse_opaque="true"
+         name="FSScriptingFontName"
+         width="100"
+         control_name="FSScriptingFontName"
+         tool_tip="Name of the font used in the LSL script editor">
+             <combo_item name="Monospace" value="Monospace" label="Monospace"/>
+             <combo_item name="Scripting" value="Scripting" label="Scripting"/>
+             <combo_item name="Cascadia" value="Cascadia" label="Cascadia Code"/>
+        </combo_box>
+        <combo_box
+         allow_text_entry="false"
+         top_delta="0"
+         left_pad="5"
+         follows="left|top"
+         max_chars="20"
+         mouse_opaque="true"
+         name="FSScriptingFontSize"
+         width="100"
+         control_name="FSScriptingFontSize"
+         tool_tip="Size of the font used in the LSL script editor">
+             <combo_item name="Monospace" value="Monospace" label="Monospace"/>
+             <combo_item name="Scripting" value="Scripting" label="Scripting"/>
+             <combo_item name="Cascadia" value="Cascadia" label="Cascadia Code"/>
+             <combo_item name="Small" value="Small" label="Small"/>
+             <combo_item name="Medium" value="Medium" label="Medium"/>
+             <combo_item name="Large" value="Large" label="Large"/>
+        </combo_box>
+
+        <check_box
+         follows="left|top"
+         height="16"
+         top_pad="10"
+         left="5"
+         label="Enable LSL preprocessor"
+         tool_tip="When checked, the LSL preprocessor is enabled."
+         name="preproc_checkbox"
+         control_name="_NACL_LSLPreprocessor" />
+        <check_box
+         follows="left|top"
+         height="16"
+         left="15"
+         enabled_control="_NACL_LSLPreprocessor"
+         label="Script optimizer"
+         tool_tip="When checked, the LSL preprocessor will optimize space used by scripts."
+         name="preprocoptimizer_checkbox"
+         control_name="_NACL_PreProcLSLOptimizer" />
+        <check_box
+         follows="left|top"
+         height="16"
+         top_delta="0"
+         left_delta="120"
+         enabled_control="_NACL_LSLPreprocessor"
+         label="switch() statement"
+         tool_tip="When checked, the LSL preprocessor will allow the use of the switch() statement for script flow control."
+         name="preprocswitch_checkbox"
+         control_name="_NACL_PreProcLSLSwitch" />
+        <check_box
+         follows="left|top"
+         height="16"
+         top_delta="0"
+         left_delta="130"
+         enabled_control="_NACL_LSLPreprocessor"
+         label="Lazy lists"
+         tool_tip="When checked, the LSL preprocessor will allow the use of syntax extensions for list handling."
+         name="preproclazy_checkbox"
+         control_name="_NACL_PreProcLSLLazyLists" />
+        <check_box
+         follows="left|top"
+         top_delta="0"
+         left_delta="80"
+         height="16"
+         enabled_control="_NACL_LSLPreprocessor"
+         label="#includes from local disk"
+         tool_tip="When checked, the LSL preprocessor will allow #include statements to reference files on your local disk."
+         name="preprocinclude_checkbox"
+         control_name="_NACL_PreProcEnableHDDInclude" />
+        <text
+         follows="left|top"
+         height="16"
+         type="string"
+         length="1"
+         layout="topleft"
+         enabled_control="_NACL_PreProcEnableHDDInclude"
+         name="lslpreprocinclude_textbox"
+         left="10"
+         width="256">
+          Preprocessor include path:
+        </text>
+        <line_editor
+         control_name="_NACL_PreProcHDDIncludeLocation"
+         border_style="line"
+         border_thickness="1"
+         follows="left|top"
+         font="SansSerif"
+         height="23"
+         enabled_control="_NACL_PreProcEnableHDDInclude"
+         max_length_chars="4096"
+         name="preprocinclude_location"
+         width="310" />
+        <button
+         follows="left|top"
+         height="23"
+         enabled_control="_NACL_PreProcEnableHDDInclude"
+         label="Browse"
+         label_selected="Browse"
+         left_pad="5"
+         name="SetPreprocInclude"
+         top_delta="0"
+         width="100">
+         <button.commit_callback
+          function="NACL.SetPreprocInclude" />
+        </button>
+        <text
+         follows="left|top"
+         height="16"
+         type="string"
+         length="1"
+         layout="topleft"
+         name="externaleditor_textbox"
+         left="10"
+         width="256">
+          External Editor:
+        </text>
+        <line_editor
+         control_name="ExternalEditor"
+         border_style="line"
+         border_thickness="1"
+         follows="left|top"
+         font="SansSerif"
+         height="23"
+         max_length_chars="4096"
+         name="externaleditor_location"
+         width="310" />
+        <button
+         follows="left|top"
+         height="23"
+         label="Browse"
+         label_selected="Browse"
+         left_pad="5"
+         name="SetExternalEditor"
+         top_delta="0"
+         width="100">
+         <button.commit_callback
+          function="Pref.SetExternalEditor" />
+        </button>
+  </panel>
+
+    <!--Build 2-->
+    <panel
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="Build 2"
+     name="BuildTab2">
+        <check_box
+         top="10"
+         follows="left|top"
+         height="16"
+         left="3"
+         label="Enable highlighting of selected prims"
+         tool_tip="When unchecked, the yellow/blue outline effects are not rendered, improving performance when large numbers of prims are selected."
+         name="FSBuildPrefsRenderHighlight_toggle"
+         control_name="RenderHighlightSelections"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Highlight boundary of currently selected parcel"
+         name="RenderParcelSelection"
+         control_name="RenderParcelSelection"
+         width="190"/>
+        <check_box
+         enabled_control="RenderParcelSelection"
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         left="13"
+         label="Show boundary up to maximum build height"
+         name="FSRenderParcelSelectionToMaxBuildHeight"
+         control_name="FSRenderParcelSelectionToMaxBuildHeight"
+         width="190"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         left="3"
+         label="Limit select distance (meters):"
+         name="LimitSelectDistance"
+         control_name="LimitSelectDistance"
+         width="190"/>
+        <spinner
+         enabled_control="LimitSelectDistance"
+         control_name="MaxSelectDistance"
+         decimal_digits="3"
+         top_delta="-5"
+         left_pad="0"
+         follows="left|top"
+         height="16"
+         increment="0.01"
+         max_val="1024"
+         min_val="0.001"
+         name="MaxSelectDistance"
+         width="75"
+         tool_tip="Maximum allowed selection distance (meters from avatar) [Default: 128.000]"/>
+        <check_box
+         left="3"
+         top_pad="13"
+         follows="left|top"
+         height="16"
+         label="Limit drag distance (meters):"
+         name="LimitDragDistance"
+         control_name="LimitDragDistance"
+         width="190"/>
+        <spinner
+         enabled_control="LimitDragDistance"
+         control_name="MaxDragDistance"
+         decimal_digits="3"
+         top_delta="-5"
+         left_pad="0"
+         follows="left|top"
+         height="16"
+         increment="0.01"
+         max_val="1024"
+         min_val="0.001"
+         name="MaxDragDistance"
+         width="75"
+         tool_tip="Maximum allowed distance in a single operation of move tool (meters from start point) [Default: 48.000]"/>
+        <text
+         left="3"
+         top_pad="13"
+         follows="left|top"
+         height="16"
+         name="RotationStepText1"
+         width="190">
+          Constrain rotations to multiples of
+        </text>
+        <spinner
+         control_name="RotationStep"
+         decimal_digits="2"
+         top_delta="-5"
+         left_pad="0"
+         follows="left|top"
+         height="16"
+         increment="0.01"
+         max_val="359.99"
+         min_val="0.01"
+         name="RotationStep"
+         width="65"
+         tool_tip="All rotations via rotation tool are constrained to multiples of this unit [Default: 1.0]"/>
+        <text
+         left_pad="5"
+         top_pad="-11"
+         follows="left|top"
+         height="16"
+         name="RotationStepText2"
+         width="270">
+          degrees, when not using 'snap to grid'
+        </text>
+        <check_box
+         left="3"
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Show unlink confirmation dialog if linkset has minimum"
+         name="FSUnlinkConfirmEnabled"
+         control_name="FSUnlinkConfirmEnabled"
+         width="325"/>
+        <spinner
+         enabled_control="FSUnlinkConfirmEnabled"
+         control_name="MinObjectsForUnlinkConfirm"
+         decimal_digits="0"
+         top_delta="-5"
+         left_pad="0"
+         follows="left|top"
+         height="16"
+         increment="1"
+         max_val="256"
+         min_val="0"
+         name="MinObjectsForUnlinkConfirm"
+         width="65"/>
+        <text
+         left_pad="5"
+         top_pad="-11"
+         follows="left|top"
+         height="16"
+         name="MinObjectsForUnlinkConfirmText2"
+         width="270">
+          objects
+        </text>
+        <check_box
+         left="3"
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Use old &quot;Set Object For Sale&quot; behavior"
+         tool_tip="When checked, object for sale info is saved on change instead of requiring a confirm."
+         name="FSCommitForSaleOnChange_toggle"
+         control_name="FSCommitForSaleOnChange"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Save scripts edited from inventory as Mono"
+         tool_tip="When checked, editing a script directly from inventory and then saving it saves as Mono instead of LSL."
+         name="FSSaveInventoryScriptsAsMono_toggle"
+         control_name="FSSaveInventoryScriptsAsMono"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Save textures from inventory to disk as PNG instead of TGA by default"
+         tool_tip="Used in the texture preview floater and context menu in inventory."
+         name="FSTextureDefaultSaveAsFormat"
+         control_name="FSTextureDefaultSaveAsFormat"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Use Ctrl+mouse to grab and manipulate objects"
+         tool_tip="When checked, you will be able to grab and move objects with your mouse and CTRL key."
+         name="FSEnableGrab"
+         control_name="EnableGrab"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+		 initial_value="false"
+         label="Allow click-drag or click-scale (together with caps lock) of a texture face in build mode"
+         tool_tip="If enabled, allows to click-drag or click-scale (together with caps lock) a texture face in build mode. This feature is still experimental and should be used with caution."
+         name="FSExperimentalDragTexture"
+         control_name="FSExperimentalDragTexture"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Preview animations on own avatar during upload"
+         tool_tip="If enabled, you can preview animations during the upload process on your own avatar"
+         name="FSUploadAnimationOnOwnAvatar"
+         control_name="FSUploadAnimationOnOwnAvatar"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Always expand animation preview advanced information"
+         tool_tip="Expand the advanced animation information in the animation preview floater by default"
+         name="FSAnimationPreviewExpanded"
+         control_name="FSAnimationPreviewExpanded"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Sort attachment spots in &quot;Attach to&quot; menus alphabetically (requires restart)"
+         tool_tip="If enabled, the list of attachments spots in the &amp;Attach to&amp; menus will be sorted alphabetically"
+         name="FSSortAttachmentSpotsAlphabetically"
+         control_name="FSSortAttachmentSpotsAlphabetically"/>
+        <check_box
+         top_pad="8"
+         follows="left|top"
+         height="16"
+         label="Use the new [APP_NAME] texture panel in the tools floater (requires restart)"
+         tool_tip="If enabled, the texture editing tools will use the refined [APP_NAME] workflow and allow editing of both Blinn-Phong and PBR textures."
+         name="FSUseNewTexturePanel"
+         control_name="FSUseNewTexturePanel"/>
+    </panel>
+
+    <!--Uploads-->
+    <panel
+     top_pad="5"
+     bottom="-1"
+     left="1"
+     right="-1"
+     follows="all"
+     label="Uploads"
+     name="UploadsTab">
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="12"
+       layout="topleft"
+       left="10"
+       name="title"
+       top_pad="10"
+       width="250">
+        Current destination folders for uploads:
+      </text>
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="12"
+       layout="topleft"
+       left="10"
+       name="title_images"
+       top_pad="17"
+       width="100">
+        Images
+      </text>
+      <text
+       type="string"
+       use_ellipses="true"
+       follows="left|top"
+       height="27"
+       layout="topleft"
+       font.style="BOLD"
+       left="10"
+       name="upload_textures"
+       top_pad="5"
+       width="370"
+       word_wrap="true" />
+      
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="12"
+       layout="topleft"
+       left="10"
+       name="title_sounds"
+       top_pad="7"
+       width="100">
+        Sounds
+      </text>
+      <text
+       type="string"
+       use_ellipses="true"
+       follows="left|top"
+       height="27"
+       layout="topleft"
+       font.style="BOLD"
+       left="10"
+       name="upload_sounds"
+       top_pad="5"
+       width="370"
+       word_wrap="true" />
+      
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="12"
+       layout="topleft"
+       left="10"
+       name="title_animations"
+       top_pad="7"
+       width="100">
+        Animations
+      </text>
+      <text
+       type="string"
+       use_ellipses="true"
+       follows="left|top"
+       height="27"
+       layout="topleft"
+       font.style="BOLD"
+       left="10"
+       name="upload_animation"
+       top_pad="5"
+       width="370"
+       word_wrap="true" />
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="12"
+       layout="topleft"
+       left="10"
+       name="title_models"
+       top_pad="7"
+       width="100">
+        Models
+      </text>
+      <text
+       type="string"
+       use_ellipses="true"
+       follows="left|top"
+       height="27"
+       layout="topleft"
+       font.style="BOLD"
+       left="10"
+       name="upload_models"
+       top_pad="5"
+       width="370"
+       word_wrap="true" />
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="12"
+       layout="topleft"
+       left="10"
+       name="title_pbr"
+       top_pad="7"
+       width="100">
+        PBR Materials
+      </text>
+      <text
+       type="string"
+       use_ellipses="true"
+       follows="left|top"
+       height="27"
+       layout="topleft"
+       font.style="BOLD"
+       left="10"
+       name="upload_pbr"
+       top_pad="5"
+       width="370"
+       word_wrap="true" />
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="30"
+       layout="topleft"
+       font.style="ITALIC"
+       left="10"
+       name="upload_help"
+       top_pad="6"
+       width="475">
+        To change a destination folder, right click on it in inventory and choose
+     "Use as default for"
+      </text>
+      <button
+       name="reset_default_folders"
+       label="Reset default folders"
+       left="10"
+       top_pad="10"
+       width="200"
+       follows="left|top" />
+    </panel>
+</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 1ec0df2b..4dba468c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -41,7 +41,7 @@
 		 mouse_opaque="false"
 		 top_pad="15"
 		 width="500">
-			Maximum bandwidth ([https://wiki.firestormviewer.org/fs_speedtest need a suggestion?]):
+			Maximum bandwidth ([https://wiki.avataresargentinos.com.ar need a suggestion?]):
 		</text>
 
 		<icon
@@ -395,7 +395,7 @@
 		 name="cache_size_label_l"
 		 top_pad="15"
 		 width="500">
-		   Texture Cache Size ([https://wiki.firestormviewer.org/cache need a suggestion?]):
+		   Texture Cache Size ([https://wiki.avataresargentinos.com.ar/cache need a suggestion?]):
 		</text>
 		<slider
 		 can_edit_text="true"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index ab431021..8d0d5e4e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -23,7 +23,7 @@
     </panel.string>
 
 <tab_container
- label="Firestorm Prefs"
+ label="Puma Prefs"
  layout="topleft"
  follows="all"
  top="5"
@@ -1202,7 +1202,7 @@ Hover your mouse cursor over UUID field to show its default value.
          left="5"
          height="14"
          width="150"
-         tool_tip="Sound UUID played on default Firestorm alerts."
+         tool_tip="Sound UUID played on default Puma alerts."
          name="textFSSndAlert">
             Default alert:
         </text>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index effc0fd9..6cf7ce9e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -24,13 +24,6 @@
     >
         Unknown
     </string>
-    <string
-     name="CaptionTextAcctInfo"
-    >
-       [ACCTTYPE]
-[PAYMENTINFO]
-[FIRESTORM][FSDEV][FSSUPP][FSQA][FSGW]
-    </string>
     
     <!--Badges-->
     <string
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index df2d04da..c5479e18 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -7,11 +7,11 @@
 
 	<!-- Default Args - these arguments will be replaced in all strings -->
 	<string name="SECOND_LIFE">[CURRENT_GRID]</string>
-	<string name="APP_NAME">Firestorm</string>
-	<string name="CAPITALIZED_APP_NAME">FIRESTORM</string>
+	<string name="APP_NAME">Puma</string>
+	<string name="CAPITALIZED_APP_NAME">PUMA</string>
 	<string name="SECOND_LIFE_GRID">Second Life Grid</string>
-	<string name="SUPPORT_SITE">Firestorm Support Portal</string>
-	<string name="DOWNLOAD_URL">https://www.firestormviewer.org/choose-your-platform/</string>
+	<string name="SUPPORT_SITE">Puma Support Portal</string>
+	<string name="DOWNLOAD_URL">https://wiki.avataresargentinos.com.ar/descargas/</string>
 	<string name="CURRENT_GRID"/> <!-- Will be set in fsgridhandler.cpp / llviewernetwork.cpp -->
 	<string name="VIEWER_GENERATION">Viewer [VERSION]</string>
 	<string name="SHORT_VIEWER_GENERATION">V[VERSION]</string>
@@ -135,15 +135,15 @@ Voice Server Version: [VOICE_VERSION]
 	<string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string>
 	<string name="LoginFailedHeader">Login failed.</string>
 	<string name="Quit">Quit</string>
-	<string name="create_account_url">https://www.firestormviewer.org/join-secondlife/</string>
+	<string name="create_account_url">https://ayudavirtual.org/unirseasl/</string>
 	
 	<string name="AgniGridLabel">Second Life Main Grid (Agni)</string>
 	<string name="AditiGridLabel">Second Life Beta Test Grid (Aditi)</string>
 	
-	<string name="ViewerDownloadURL">https://www.firestormviewer.org/choose-your-platform/</string>
+	<string name="ViewerDownloadURL">https://wiki.avataresargentinos.com.ar/descargas/</string>
 	<string name="LoginFailedViewerNotPermitted">
 The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
-https://www.firestormviewer.org/choose-your-platform/
+https://wiki.avataresargentinos.com.ar/descargas/
 
 For more information, see our FAQ below:
 http://secondlife.com/viewer-access-faq</string>
@@ -402,7 +402,7 @@ are allowed.
 
 	<string name="ReleaseNotes">Release Notes</string>
 	<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
-	<string name="RELEASE_NOTES_BASE_URL" translate="false">https://wiki.firestormviewer.org/changelog:firestorm_change_log_</string>
+	<string name="RELEASE_NOTES_BASE_URL" translate="false">https://wiki.avataresargentinos.com.ar</string>
 
 	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
 	<string name="LoadingData">Loading...</string>
@@ -443,7 +443,7 @@ are allowed.
 	<string name="AssetUploadServerUnavaliable">Service not available or upload timeout was reached.</string>
 	<string name="AssetUploadRequestInvalid">
 Error in upload request.  Please visit 
-https://www.firestormviewer.org/support for help fixing this problem.
+https://wiki.avataresargentinos.com.ar for help fixing this problem.
 </string>
 
 	<!-- Settings errors -->
@@ -985,7 +985,8 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="InvFolder Friends">Friends</string>	
 	<string name="InvFolder All">All</string>
 
-	<!-- Virtual Firestorm system folders -->
+	<!-- Virtual Puma/Firestorm system folders -->
+    <string name="InvFolder #Puma">#Puma</string>
 	<string name="InvFolder #Firestorm">#Firestorm</string>
 	<string name="InvFolder #Phoenix">#Phoenix</string>
 	<string name="InvFolder #RLV">#RLV</string>
@@ -2737,7 +2738,7 @@ name="Command_360_Capture_Label">360° Snapshot</string>
 <!-- Ansariel: Renamed for FS (FIRE-5019)
   <string name="Command_Voice_Label">Voice settings</string>-->
   <string name="Command_Voice_Label">Nearby voice</string>
-<!-- Firestorm commands -->
+<!-- Puma commands -->
   <string name="Command_Quickprefs_Label">Quick prefs</string>
   <string name="Command_AO_Label">Animation overrider</string>
   <string name="Command_Webbrowser_Label">Web browser</string>
@@ -2806,7 +2807,7 @@ name="Command_360_Capture_Tooltip">Capture a 360° equirectangular image</string
   <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
   <string name="Command_View_Tooltip">Changing camera angle</string>
   <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
-<!-- Firestorm commands -->
+<!-- Puma commands -->
   <string name="Command_Quickprefs_Tooltip">Quick preferences for changing often used settings</string>
   <string name="Command_AO_Tooltip">Animation overrider</string>
   <string name="Command_Webbrowser_Tooltip">Opens the internal web browser (CTRL+SHIFT+Z)</string>
@@ -3058,7 +3059,7 @@ and report the problem.
   <string name="FSWithHavok">with Havok support</string>
   <string name="FSWithOpensim">with OpenSimulator support</string>
     
-  <!-- Firestorm search -->
+  <!-- Puma search -->
   <string name="not_found">&apos;[TEXT]&apos; not found</string>
   <string name="no_results">No results</string>
   <string name="searching">Searching...</string>
@@ -3290,7 +3291,8 @@ Your current position: [AVATAR_POS]
   <string name="font_fonts_celestia_medium_redux.xml">Celestia Medium Redux</string>
   <string name="font_fonts_cascadia_code.xml">Cascadia Code</string>
   <string name="mode_unknown">Unknown Mode</string>
-  <string name="mode_settings_firestorm.xml">[APP_NAME]</string>
+  <string name="mode_settings_puma.xml">[APP_NAME]</string>
+  <string name="mode_settings_firestorm.xml">Firestorm</string>
   <string name="mode_settings_phoenix.xml">Phoenix</string>
   <string name="mode_settings_v3.xml">[VIEWER_GENERATION]</string>
   <string name="mode_settings_hybrid.xml">Hybrid</string>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 03b6daec..ad76e1ab 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -45,35 +45,35 @@ Calidad de dibujo (Render quality): [RENDERQUALITY]
 	<tab_container name="about_tab">
 		<panel label="Información" name="support_panel">
 			<text name="support_intro">    
-				Para obtener la información más reciente acerca de Firestorm, visita
-https://www.firestormviewer.org
+				Para obtener la información más reciente acerca de Puma, visita
+https://www.avataresargentinos.com.ar/puma
 			</text>
   			<button label="Copiar al portapapeles" name="copy_btn"/>
 		</panel>
 		<panel label="Créditos de Linden Lab" name="credits_panel">
         		<text name="linden_intro">
-				Firestorm no sería posible sin la decisión de Linden Lab de liberar el código fuente de su Visor para Second Life.
+				Puma no sería posible sin la decisión de Linden Lab de liberar el código fuente de su Visor para Second Life.
 
 Los Linden son,
 con contribuciones de código de:
 			</text>
 		</panel>
-		<panel label="Créditos de Firestorm" name="fs_credits_panel">
+		<panel label="Créditos de Puma" name="fs_credits_panel">
 			<scroll_container name="fs_credits_scroll_container">
 				<panel name="fs_credits_scroll_container_content_panel">
 					<text name="firestorm_intro">
-						Firestorm es un proyecto de desarrollo de la comunidad para mejorar la experiencia de uso del Visor de SecondLife(tm). Compilamos contribuciones de varios desarrolladores de la comunidad junto con el código de Linden lab y el nuestro propio para brindarte un visor de calidad, enriquecido con nuevas características y respaldado por un amplio equipo de voluntarios para darte soporte. Firestorm llega a ti a través de The Phoenix Firestorm Project, Inc., una organización sin ánimo de lucro.
+						Puma es un proyecto personal. basadoen contribuciones de varios desarrolladores de la comunidad junto con el código de Linden lab y, principalmente, en el código del visor Firestorm. Puma llega a ti a través de Avatares Argentinos.
 
-Forman el Equipo de Desarrollo de Firestorm:
+Forman el Equipo de Desarrollo de Puma:
 					</text>
 					<text name="fs_contrib_intro" >
 						Han contribuído generosamente con código adicional:
 					</text>
 					<text name="fs_support_intro" >
-						Agradecimientos especiales para nuestro Equipo de Soporte de Firestorm, editores del wiki, educadores, y traductores:
+						Agradecimientos especiales para el Equipo de Soporte de Firestorm, editores del wiki, educadores, y traductores:
 					</text>
 					<text name="fs_art_intro" >
-						Firestorm incluye Starlight, modificado por Firestorm. Proporcionado por residentes para los residentes, con la intención de proveer una interfaz de uso alternativa, más luminosa y esperamos que más fácil de usar. Para más detalles ver &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
+						Puma incluye Starlight, modificado por Firestorm. Proporcionado por residentes para los residentes, con la intención de proveer una interfaz de uso alternativa, más luminosa y esperamos que más fácil de usar. Para más detalles ver &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
 
 Artistas y Diseñadores de la interfaz:
 					</text>
diff --git a/indra/newview/skins/default/xui/es/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/es/floater_fs_nearby_chat.xml
index 5fbcae98..705d4161 100644
--- a/indra/newview/skins/default/xui/es/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/es/floater_fs_nearby_chat.xml
@@ -17,7 +17,7 @@
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
 						<layout_panel name="input_button_layout_panel">
-							<spinner name="ChatChannel" tool_tip="Canal al que enviar el chat. Activado en Preferencias  -> Chat -> Firestorm -> Mostrar selector de canal en la barra de chat."/>
+							<spinner name="ChatChannel" tool_tip="Canal al que enviar el chat. Activado en Preferencias  -> Chat -> Puma -> Mostrar selector de canal en la barra de chat."/>
 						</layout_panel>
 						<layout_panel name="chat_type_layout_panel">
 							<combo_box name="chat_type" tool_tip="Susurrar = 10m, Hablar = 20m, Gritar = 100m">
diff --git a/indra/newview/skins/default/xui/es/floater_fs_search.xml b/indra/newview/skins/default/xui/es/floater_fs_search.xml
index a54f3801..608aca46 100644
--- a/indra/newview/skins/default/xui/es/floater_fs_search.xml
+++ b/indra/newview/skins/default/xui/es/floater_fs_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_fs_search" title="Búsqueda Firestorm">
+<floater name="floater_fs_search" title="Búsqueda Puma">
 	<floater.string name="string.location">
 		Lugar: [LOCATION]
 	</floater.string>
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 3f8880f1..2ebec4d0 100644
--- a/indra/newview/skins/default/xui/es/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml
@@ -22,7 +22,7 @@
 			<text name="plugin_fail_text">
 				El conector del navegador web parece estar tardando en abrirse. Si no se termina de abrir, por favor visita:
 
-https://wiki.firestormviewer.org/fs_media
+https://wiki.avataresargentinos.com.ar
 
 para ver posibles formas de resolver este problema.
 			</text>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
index 6036c1d2..2b7b87c6 100644
--- a/indra/newview/skins/default/xui/es/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences.xml
@@ -21,8 +21,8 @@
 		<panel label="Interfaz" name="ui"/>
 		<panel label="Skins" name="skins"/>
 		<panel label="Reporte de fallos" name="crashreports"/>
-		<panel label="Firestorm" name="firestorm"/>
-		<panel label="Opensim" name="opensim"/>
+		<panel label="Puma" name="puma"/>
+		<panel label="Grids" name="grids"/>
 		<panel label="Respaldo" name="backup"/>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_quickprefs.xml b/indra/newview/skins/default/xui/es/floater_quickprefs.xml
index fdd8c97c..29906be8 100644
--- a/indra/newview/skins/default/xui/es/floater_quickprefs.xml
+++ b/indra/newview/skins/default/xui/es/floater_quickprefs.xml
@@ -3,7 +3,7 @@
 	<panel name="quickprefs" width="265">
 		<layout_stack name="wl_options_stack">
 			<layout_panel name="wl_options_panel">
-				<text name="Maximum bandwidth" tool_tip="Configura el ancho de banda de red máximo que puede consumir Firestorm Viewer (en kilobits por segundo)" width="91">
+				<text name="Maximum bandwidth" tool_tip="Configura el ancho de banda de red máximo que puede consumir Puma Viewer (en kilobits por segundo)" width="91">
 					Ancho de banda:
 				</text>
 				<slider name="max_bandwidth"/>
@@ -50,4 +50,4 @@
 		<button name="button_close" tool_tip="Cierra el panel de edición"/>
 	</panel>
 </floater>
-	
\ No newline at end of file
+	
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 3b2a35de..ddebd602 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -214,9 +214,9 @@
 	</menu>	
 	<menu label="Ayuda" name="Help">
 		<menu_item_check label="Mostrar consejos" name="Enable Hints"/>
-		<menu_item_call label="Firestorm Wiki" name="Firestorm Wiki"/>
+		<menu_item_call label="Puma Wiki" name="Puma Wiki"/>
 		<menu_item_call label="Solución de problemas" name="Troubleshooting"/>
-		<menu_item_call label="Unirse al Grupo de Soporte de Firestorm" name="firestorm_support_group"/>
+		<menu_item_call label="Unirse al Grupo de Soporte de Puma" name="puma_support_group"/>
 		<menu_item_check label="Cómo..." name="How To"/>
 		<menu_item_call label="Ayuda de [CURRENT_GRID]" name="current_grid_help"/>
 		<menu_item_call label="Acerca de [CURRENT_GRID]" name="current_grid_about"/>
@@ -613,7 +613,7 @@
 	<menu label="Mundo" name="V1-World"/>
 	<menu label="Herramientas" name="V1-Tools"/>
 	<menu label="Ayuda" name="V1-Help"/>
-	<menu label="Firestorm" name="V1-Firestorm"/>
+	<menu label="Puma" name="V1-Puma"/>
 	<menu label="Avanzado" name="V1-Advanced">
 		<menu_item_check label="Usar menús V1" name="V1 Menus"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 422c54fa..095aa856 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -79,7 +79,7 @@ Detalles del error: la notificación de nombre &apos;[_NAME]&apos; no se ha enco
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="BadInstallation">
-		Ha habido un error actualizando [APP_NAME]. Por favor, [https://www.firestormviewer.org/downloads descarga la última versión] del Visor.
+		Ha habido un error actualizando [APP_NAME]. Por favor, [https://wiki.avataresargentinos.com.ar/descargas descarga la última versión] del Visor.
 		<usetemplate name="okbutton" yestext="Aceptar"/>
 	</notification>
 	<notification name="LoginFailedNoNetwork">
@@ -3739,7 +3739,7 @@ Al ocultar el botón Hablar se desactiva la función de voz.
 		</form>
 	</notification>
 	<notification name="ModeChange">
-		Cambiar entre los diferentes modos requiere que cierres y reinicies Firestorm.
+		Cambiar entre los diferentes modos requiere que cierres y reinicies Puma.
 		<usetemplate name="okcancelbuttons" yestext="Cerrar" notext="No cerrar"/>
 	</notification>
 	<notification label="" name="NoClassifieds">
@@ -4723,22 +4723,13 @@ El nombre NO puede contener los caracteres ":" o "|".
 		[REASON]
 		<usetemplate name="okbutton" yestext="Aceptar"/>
 	</notification>
-	<notification name="FireStormReqInfo">
-		[NAME] te solicita que le envíes información sobre tu configuración de [APP_NAME] (Ésta es la misma información que puedes encontrar en Ayuda->Acerca de [APP_NAME])    
-[REASON]
-¿Aceptas enviarle esta información?
-		<form name="form">
-			<button name="Yes" text="Sí"/>
-			<button name="No" text="No"/>
-		</form>
-	</notification>
 	<notification name="PhantomOn">
 		Modo fantasma activado.
 	</notification>
 	<notification name="PhantomOff">
 		Modo fantasma desactivado.
 	</notification>
-	<notification label="Restablecer todas las configuraciones" name="FirestormClearSettingsPrompt">
+	<notification label="Restablecer todas las configuraciones" name="PumaClearSettingsPrompt">
 	Restablecer todas las configuraciones puede ser útil si estás experimentando problemas, aunque tendrás que repetir todas las personalizaciones que hayas podido hacer a la configuración por defecto. 
 
 ¿Estás seguro/a de que quieres proceder?
@@ -4843,7 +4834,7 @@ Configuración actual: [CURRENT_VALUE]
 		La cache del visor está vacía. Por favor, ten en cuenta que puedes sufrir de lentitud de movimiento y de inventario mientras se carga el nuevo contenido.
 	</notification>
 	<notification name="FirstJoinSupportGroup2">
-		¡Bienvenido al Grupo de Soporte de Phoenix/Firestorm Viewer!
+		¡Bienvenido al Grupo de Soporte de Puma Viewer!
 Para facilitar el soporte, se recomienda que publiques la versión de tu visor en el grupo. Esta información incluye la versión actual del visor, el skin del visor, el sistema operativo y el estatus del RLVa. Puedes mostrar la versión de tu visor delante de cada mensaje que envías al grupo. Nuestros miembros de soporte pueden darte respuestas más adecuadas si saben qué visor estás usando.
 
 Puedes activar y desactivar esta función en cualquier momento usando la casilla existente en la ventana del chat del grupo.
@@ -4852,7 +4843,7 @@ Puedes activar y desactivar esta función en cualquier momento usando la casilla
 		<form name="form">
 			<button name="OK_okcancelignore" text="Sí"/>
 			<button name="Cancel_okcancelignore" text="No"/>
-			<ignore name="ignore" text="Te has unido al Grupo de Soporte de Phoenix/Firestorm"/>
+			<ignore name="ignore" text="Te has unido al Grupo de Soporte de Puma"/>
 		</form>
 	</notification>
 	<notification name="ConfirmScriptModify">
diff --git a/indra/newview/skins/default/xui/es/panel_fs_login.xml b/indra/newview/skins/default/xui/es/panel_fs_login.xml
index 3ab215e9..c80f09ad 100644
--- a/indra/newview/skins/default/xui/es/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_fs_login.xml
@@ -47,6 +47,7 @@
 				SELECCIONAR MODO:
 			</text>
 			<combo_box name="mode_combo" tool_tip="Selecciona con qué estilo de visor estás más familiarizado para establecer tus opciones por defecto apropiadamente.">
+                <combo_box.item label="Puma" name="Puma"/>
 				<combo_box.item label="Firestorm" name="Firestorm"/>
 				<combo_box.item label="Phoenix" name="Phoenix"/>
 				<combo_box.item label="Híbrido" name="Hybrid"/>
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index 5b78c7f9..fbf7dbaf 100644
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -4,7 +4,7 @@
 		http://secondlife.com/account/request.php?lang=es
 	</panel.string>
 	<panel.string name="sign_up_url">
-		https://www.firestormviewer.org/join-secondlife/
+		https://ayudavirtual.org/unirseasl/
 	</panel.string>
 	<layout_stack name="ui_stack">
 		<layout_panel name="ui_container">
diff --git a/indra/newview/skins/default/xui/es/panel_login_first.xml b/indra/newview/skins/default/xui/es/panel_login_first.xml
index 71de7e6a..010969b6 100644
--- a/indra/newview/skins/default/xui/es/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/es/panel_login_first.xml
@@ -4,7 +4,7 @@
 		http://secondlife.com/account/request.php?lang=es
 	</panel.string>
 	<panel.string name="sign_up_url">
-		https://www.firestormviewer.org/join-secondlife/
+		https://ayudavirtual.org/unirseasl/
 	</panel.string>
 	<layout_stack name="logo_stack">
 		<layout_panel name="parent_panel2">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_UI.xml b/indra/newview/skins/default/xui/es/panel_preferences_UI.xml
index f208cd0d..d5546477 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_UI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="UI-Pref" name="Display panel">
-	<tab_container label="Prefs Firestorm" name="tabs">
+	<tab_container label="Prefs Puma" name="tabs">
 		<panel label="3D mundo" name="UI Prefs Panel">
 			<text name="HoverTipText">
 				Bulas:
@@ -56,7 +56,7 @@
 			<text name="GroupTopRightRequiresRestart" left_delta="267">
 				(requiere reiniciar)
 			</text>
-			<check_box label="Ocultar los iconos de notificación de chat de grupo y MI" name="FSDisableIMChiclets" tool_tip="Si se activa, Firestorm no mostrará ningún icono de notificación de chat de grupo / MI (el sobre de los avisos de grupo y la suma de MIs permanecerán en pantalla)."/>
+			<check_box label="Ocultar los iconos de notificación de chat de grupo y MI" name="FSDisableIMChiclets" tool_tip="Si se activa, Puma no mostrará ningún icono de notificación de chat de grupo / MI (el sobre de los avisos de grupo y la suma de MIs permanecerán en pantalla)."/>
 			<slider label_width="230" label="Número de parpadeos de los botones:" tool_tip="Número de veces que los botones parpadean para llamar tu atención" name="ButtonsFlashCount"/>
 			<slider label_width="230" name="ButtonFlashRate"/>
 <!--
@@ -68,7 +68,7 @@
 		</panel>
 		<panel name="UI-interface-top-bars">
 			<check_box name="ShowNetStats" label="Mostrar medidor de lag" tool_tip="Muestra el medidor de lag en la barra de estado"/>
-			<check_box label="Mostrar controles de medios en esquina superior derecha" name="FSEnableVolumeControls" tool_tip="Si lo activas, Firestorm mostrará los controles de sonido, flujos de medios y audio, etc.) en la esquina superior derecha de la pantalla. Puede ser útil desactivarlo si la skin seleccionada ya dispone de sus propios controles." />
+			<check_box label="Mostrar controles de medios en esquina superior derecha" name="FSEnableVolumeControls" tool_tip="Si lo activas, Puma mostrará los controles de sonido, flujos de medios y audio, etc.) en la esquina superior derecha de la pantalla. Puede ser útil desactivarlo si la skin seleccionada ya dispone de sus propios controles." />
 			<check_box label="Mostrar canal del simulador en la barra de estado" name="FSStatusbarShowSimulatorVersion" tool_tip="Muestra el canal del simulador actual (RC Magnum, RC Le Tigre, RC BlueSteel etc.) en la barra de estado estilo V1."/>
 			<check_box label="Mostrar localización en la barra de menú" name="ShowMenuBarLocation" />
 			<check_box label="Mostrar la barra de favoritos" name="ShowNavbarFavoritesPanel" />
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
index 29216395..c1bb1655 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
@@ -7,7 +7,7 @@
 		Botón central del ratón
 	</panel.string>
 	<check_box label="Permitir múltiples instancias del visor (puede reducir la estabilidad y el rendimiento)" name="allow_multiple_viewer_check"/>
-	<check_box label="Permitir el inicio de sesión en otras redes (no todas las redes soportarán Firestorm)" name="show_grid_selection_check"/>
+	<check_box label="Permitir el inicio de sesión en otras redes (no todas las redes soportarán Puma)" name="show_grid_selection_check"/>
 	<check_box label="Mostrar el menú Avanzado" name="show_advanced_menu_check"/>
 	<check_box label="Mostrar el menú Desarrollo" name="show_develop_menu_check"/>
 	<text name="BackgroundYieldTimeText">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
index 3e551571..2f3bf0c0 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
@@ -8,7 +8,7 @@
 	<check_box name="FSPaymentInfoInChat" label="Transacciones de L$ en el chat local en vez de en tostadas"/>
 	<check_box label="Notificar los cambios de versión de simulador al cambiar de región" name="FSShowServerVersionChangeNotice" tool_tip="Muestra un aviso si la versión de simulador cambia durante un teleporte o al cruzar a otra región."/>
 	<check_box label="Activar notificaciones Growl" name="notify_growl_checkbox"/>
-	<check_box name="notify_growl_always_checkbox" label="Mostrar Growl incluso si Firestorm está activo"/>
+	<check_box name="notify_growl_always_checkbox" label="Mostrar Growl incluso si Puma está activo"/>
     </panel>
 
     <!-- People -->
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 454f4212..682207db 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
-	<tab_container label="Prefs. Firestorm" name="tabs">
+	<tab_container label="Prefs. Puma" name="tabs">
 		<panel label="Visuals" name="ChatVisuals">
 			<text name="console_font_size" width="180">
 				Fuente de consola:
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_crashreports.xml b/indra/newview/skins/default/xui/es/panel_preferences_crashreports.xml
index f8eb9197..a5e6af3d 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_crashreports.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_crashreports.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Reporte de fallos" name="crash_reports">
-	<check_box label="Enviar reportes de fallos a firestormviewer.org" name="checkSendCrashReports"/>
+	<check_box label="Enviar reportes de fallos a avataresargentinos.com.ar" name="checkSendCrashReports"/>
 	<check_box label="Preguntar siempre antes de enviar" name="checkSendCrashReportsAlwaysAsk"/>
 	<check_box label="Incluir settings.xml" name="checkSendSettings"/>
 	<text name="textSendSettings">
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 76b68e3c..87c1f81c 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -26,7 +26,7 @@
 			<text name="ShadersPrefText4">
 				Ultra
 			</text>
-			<check_box label="Pantalla completa" name="Fullscreen Mode" tool_tip="Ejecutar Firestorm en modo de pantalla completa. Se requiere reiniciar para cambiar el modo."/>
+			<check_box label="Pantalla completa" name="Fullscreen Mode" tool_tip="Ejecutar Puma en modo de pantalla completa. Se requiere reiniciar para cambiar el modo."/>
 			<text name="ShadersText">
 				Efectos gráficos:
 			</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
new file mode 100644
index 00000000..fff278ab
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_grids.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Opensim" name="opensim_panel">
+	<tab_container name="tabs">
+		<panel label="Gestor de redes" name="grid_management_panel">
+			<text name="add_grid_text">
+				Añadir nueva red
+			</text>
+			<button label="Limpiar" label_selected="Limpiar" name="clear_grid"/>
+			<button label="Aplicar" name="apply_new_grid"/>
+			<text name="add_grid_text">
+				Gestionar redes
+			</text>
+			<scroll_list name="grid_list">
+				<scroll_list.columns label="Nombre" name="grid_label"/>
+				<scroll_list.columns label="Login URI" name="login_uri"/>
+			</scroll_list>
+			<button label="Actualizar" name="refresh_grid"/>
+			<button label="Eliminar" name="remove_grid"/>
+			<panel name="advanced_grid_panel">
+				<text name="grid_name_text">
+					Nombre:
+				</text>
+				<button label="Guardar" name="save_grid"/>
+			</panel>
+		</panel>
+		<panel label="Varios" name="opensim_misc_panel">
+			<check_box label="Búsqueda de depuración" name="DebugSearch"/>
+			<text name="search_url_debug_text">
+				Substituir la actual URL de búsqueda (si no está vacío):
+			</text>
+			<button label="Limpiar" label_selected="Limpiar" name="clear_search_url_debug"/>
+			<button label="Elegir" name="pick_current_search_url"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_puma.xml b/indra/newview/skins/default/xui/es/panel_preferences_puma.xml
new file mode 100644
index 00000000..230559c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_puma.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Puma" name="puma">
+	<tab_container label="Prefs Puma" name="tabs">
+		<panel label="Extras" name="tab-extras">
+			<check_box name="checkMiscRLVa" label="Permitir control remoto del visor mediante scripts (RLVa)" width="330"/>
+			<text name="textMiscRLVaRestart">
+				(requiere reiniciar)
+			</text>
+			<check_box label="Si es posible, rezzear objetos siempre bajo el grupo del terreno" name="grouplandrez" tool_tip="Procura rezzear los objetos bajo el grupo del terreno si perteneces al mismo, aunque no tengas activa la etiqueta correspondiente"/>
+			<check_box label="Crear efectos de partículas cuando los scripts se comunican" name="EffectScriptChatParticles" tool_tip="Si lo activas, los objetos con scripts mostrarán remolinos de partículas de luz cuando los scripts se comuniquen"/>
+			<check_box label="Desactivar la baliza de seguimiento al alcanzar al avatar (&lt;= 3m)" name="FSDisableAvatarTrackerAtCloseIn" tool_tip="Si lo activas, la baliza de seguimiento se desactivará automáticamente si la distancia con el avatar es menor que 3 metros. (Por defecto)."/>
+			<check_box label="Desactivar la pantalla de progreso del inicio de sesión" name="login_screen_toggle" tool_tip="Desactiva la pantalla negra que muestra el progreso del inicio de la sesión"/>
+			<check_box label="Desactivar la pantalla de progreso del cierre de sesión" name="logout_screen_toggle" tool_tip="Desactiva la pantalla negra que muestra el progreso del cierre de la sesión."/>
+			<check_box label="Activar escalado progresivo de distancia de dibujo" name="FSRenderFarClipStepping" tool_tip="Si lo activas, Puma aumentará progresivamente la distancia de dibujo después de un teleporte." width="300"/>
+			<slider name="progressive_draw_distance_interval" tool_tip="Intérvalo en segundos entre cada incremento de distancia de dibujo"/>
+		</panel>
+		<panel label="Protección" name="ProtectionTab">
+			<check_box label="Impedir que pueda sentarme con un clic del botón izquierdo del ratón" name="FSBlockClickSit"/>
+			<check_box label="Permitir a los scripts que muestren el IU del mapa (llMapDestination)" name="ScriptsCanShowUI"/>
+			<text name="revokepermissions_txt">
+				Revocar permisos:
+			</text>
+			<radio_group name="FSRevokePerms">
+				<radio_item label="Nunca (comportamiento original)" name="never_radio"/>
+				<radio_item label="Revocar al sentarse" name="sit_radio"/>
+				<radio_item label="Revocar al levantarse" name="stand_radio"/>
+				<radio_item label="Revocar al sentarse y al levantarse" name="sitnstand_radio"/>
+			</radio_group>
+			<text name="SurfaceAreaThreshholdLabel" width="400">
+				Protección contra lag de texturas (puede 'romper' algunos objetos):
+			</text>
+			<check_box label="Ocultar automáticamente objetos con grandes áreas de textura. Umbral:" name="RenderVolumeSAProtection" tool_tip="Te protege de objetos con grandes texturas sobre grandes superficies, a veces diseñados para provocar fallos del visor. El umbral por defecto es de 5.000 metros cuadrados, pero si crees que algunos objetos no se están dibujando y esta opción está activada, puedes necesitar aumentarlo." width="425"/>
+			<spinner left_pad="5" name="RenderVolumeSAFrameMax" width="60"/>
+			<check_box label="Activar protección contra spam" name="UseAntiSpam"/>
+			<text name="AntiSpamText1" width="305">
+				Máximo de líneas en un solo mensaje:
+			</text>
+			<spinner name="_NACL_AntiSpamNewlines" tool_tip="Máximo número de líneas aceptadas en un único mensaje para no ser considerado spam [Por defecto: 70]"/>
+			<text name="AntiSpamText2" width="305">
+				Máximos eventos de un mismo origen:
+			</text>
+			<spinner name="_NACL_AntiSpamAmount" tool_tip="Máximo número de evento similares a aceptar de un mismo origen en el intérvalo de 2 segundos [Por defecto: 10]"/>
+			<text name="AntiSpamText3" width="305">
+				Multiplicador de peticiones de reproducción de sonido:
+			</text>
+			<spinner name="_NACL_AntiSpamSoundMulti" tool_tip="Multiplicador de eventos para peticiones de reproducción de sonido [Por defecto: 10]"/>
+			<text name="AntiSpamText4" width="305">
+				Multiplicador de peticiones de precarga de sonido:
+			</text>
+			<spinner name="_NACL_AntiSpamSoundPreloadMulti" tool_tip="Multiplicador de eventos para peticiones de precarga de sonido [Por defecto: 4]"/>
+			<button name="AntiSpamUnblock" label="Desbloquear todas las fuentes de spam" width="250"/>
+		</panel>
+		<panel label="Avatar" name="puma_avatar">
+			<text name="HeadMovement">
+				Movimiento de la cabeza del avatar para seguir al ratón (0 para no seguirlo):
+			</text>
+			<slider label="Rango vertical del seguimiento del ratón con la cabeza:" tool_tip="Rango vertical en que la cabeza del avatar sigue al ratón (en grados)" name="PitchFromMousePositionSlider" label_width="315"/>
+			<text name="PitchFromMousePositionText">
+				grados
+			</text>
+			<slider label="Rango vertical del seguimiento del ratón con la cabeza:" tool_tip="Rango horizontal en que la cabeza del avatar sigue al ratón (en grados)" name="YawFromMousePositionSlider" label_width="315"/>
+			<text name="YawFromMousePositionText">
+				grados
+			</text>
+			<text name="note_lookat">
+				(Configuración de los puntos de mira en la pestaña de Privacidad)
+			</text>
+			<text name="BeamPrefs">
+				Efectos de partículas del rayo de selección
+			</text>
+			<button name="BeamColor_delete" label="Borrar" tool_tip="Eliminar esta configuración"/>
+			<combo_box name="BeamColor_combo" tool_tip="Selecciona la configuración de colores para el rayo de selección"/>
+			<button name="BeamColor_new" label="Crear nuevo" tool_tip="Crear una nueva configuración de color" width="85"/>
+			<button name="BeamColor_refresh" label="Refrescar lista" tool_tip="Refresca la lista de configuraciones" width="85"/>
+			<button left="113" name="PhoenixBeamPrev_rainbow"/>
+			<slider name="FSMaxBeamsPerSecond" label="Frec. de actualización:" tool_tip="Cuántas actualizaciones del rayo enviar por segundo. 40 por defecto" label_width="125"/>
+			<check_box label="Activar rayo de selección" name="SLPartBeam"/>
+			<check_box label="Enviar datos de selección al chat" name="FSParticleChat" tool_tip="Envía los datos de selección (inicio/final de selección y posición global) al canal 9000 del chat."/>
+			<combo_box name="FSBeamShape_combo" tool_tip="Selecciona la forma del rayo de partículas"/>
+			<button name="delete_beam" label="Borrar" tool_tip="Elimina este rayo"/>
+			<button name="custom_beam_btn" label="Crear nuevo" tool_tip="Personalizar la forma del rayo" width="85"/>
+			<button name="refresh_beams" label="Refrescar lista" tool_tip="Refrescar la lista de rayos" width="85"/>
+			<button left="277" name="PhoenixBeamPrev_Phoenix"/>
+			<slider name="FSBeamShapeScale" label="Escala:" tool_tip="Cambia la escala de la forma utilizada para el rayo con forma Phoenix" left_delta=""/>
+		</panel>
+		<panel label="Constr. 1" name="BuildTab">
+			<text name="text_box_objprams" left="17">
+				Tamaño por defecto
+			</text>
+			<text name="text_box_objprams2" left="165">
+				Configuración
+			</text>
+			<text name="text_box_objprams3" left="370">
+				Textura
+			</text>
+			<view_border name="TextureBorder" width="265"/>
+			<spinner label="X" name="X size"/>
+			<spinner label="Y" name="Y size"/>
+			<spinner label="Z" name="Z size"/>
+			<check_box label="Fantasma" name="FSBuildPrefs_PhantomToggle"/>
+			<check_box label="Físico" name="FSBuildPrefs_PhysicalToggle"/>
+			<check_box label="Temporal" name="FSBuildPrefs_TemporaryToggle"/>
+			<combo_box name="material" left="165">
+				<combo_item name="Stone" label="Piedra"/>
+				<combo_item name="Metal" label="Metal"/>
+				<combo_item name="Glass" label="Cristal"/>
+				<combo_item name="Wood" label="Madera"/>
+				<combo_item name="Flesh" label="Carne"/>
+				<combo_item name="Plastic" label="Plástico"/>
+				<combo_item name="Rubber" label="Goma"/>
+			</combo_box>
+			<texture_picker label="Textura" name="texture control" tool_tip="Pulsa para elegir una textura"/>
+			<color_swatch label="Color" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/>
+			<spinner label="Transp." name="alpha"/>
+			<spinner label="Respl." name="glow"/>
+			<check_box label="Brillo completo" name="EmFBToggle"/>
+			<combo_box name="combobox shininess" tool_tip="Establece el nivel de brillo del objeto">
+				<combo_item name="None" label="Ninguno"/>
+				<combo_item name="Low" label="Bajo"/>
+				<combo_item name="Medium" label="Medio"/>
+				<combo_item name="High" label="Alto"/>
+				</combo_box>
+			<check_box name="FSBuildPrefs_EmbedItem" label="Incrustar un objeto en los nuevos prims"/>
+			<fs_embedded_item_drop_target name="embed_item" tool_tip="Arrastra aquí un ítem del inventario.">
+				Arrastra aquí un ítem del inventario.
+			</fs_embedded_item_drop_target>
+			<text name="build_item_add_disp_rect_txt">
+				Actualmente establecido a: [ITEM]
+			</text>
+			<text name="text_box_pivotpoint">
+				Punto de pivotaje
+			</text>
+			<view_border name="PivotBorder" width="142"/>
+			<check_box label="Eje en prim raíz" tool_tip="El comportamiento por defecto es mostrar el eje en el centro de masa del conjunto. Si lo activas, el eje se mostrará en la primitiva raíz (principal) del conjunto de primitivas enlazadas." name="FSBuildPrefsActualRoot_toggle"/>
+			<spinner label="Pos. X" name="X pos"/>
+			<spinner label="Pos. Y" name="Y pos"/>
+			<spinner label="Pos. Z" name="Z pos"/>
+			<check_box label="Valores porcent." tool_tip="Los valores por defecto son porcentajes y cada eje se establece en 50" name="FSPivotPercToggle"/>
+			<check_box label="Activar el preprocesador LSL" tool_tip="Marcar para activar el preprocesador LSL." name="preproc_checkbox"/>
+			<check_box label="Optimizar scripts" tool_tip="Marcar para que el preprocesador LSL optimice el espacio utilizado por los scripts, a costa de su legibilidad." name="preprocoptimizer_checkbox"/>
+			<check_box label="Instrucción switch()" tool_tip="Marcar para que el preprocesador LSL permita el uso de la instrucción switch() para controlar el flujo de los scripts." name="preprocswitch_checkbox"/>
+			<check_box label="Lazy lists" tool_tip="Marcar para que el preprocesador LSL permita el uso de extensiones de sintaxis para el manejo de listas." name="preproclazy_checkbox"/>
+			<check_box label="#includes desde el disco local" tool_tip="Marcar para que el preprocesador LSL permita instrucciones #include para referenciar ficheros en tu sistema local." name="preprocinclude_checkbox"/>
+			<text name="lslpreprocinclude_textbox">
+				Ruta include del preprocesador:
+			</text>
+			<button label="Examinar" label_selected="Examinar" name="SetPreprocInclude"/>
+		</panel>
+		<panel label="Constr. 2" name="BuildTab2">
+			<check_box label="Resaltar las primitivas seleccionadas" tool_tip="Cuando lo desactivas, no se muestran los efectos amarillos/azules de resaltado, mejorando el rendimiento cuando se selecciona un gran número de primitivas." name="FSBuildPrefsRenderHighlight_toggle"/>
+			<check_box label="Limitar la distancia de selección:" width="200" name="LimitSelectDistance"/>
+			<check_box label="Modo antiguo de &quot;Poner en venta&quot;" tool_tip="Cuando lo activas, la información de venta del objeto se guarda al cambiarla, en vez de pedir confirmación." name="FSCommitForSaleOnChange_toggle"/>
+			<check_box label="Guardar como Mono los scripts editados desde el inventario" tool_tip="Cuando está activado, al editar un script directamente desde el inventario y luego guardarlo, lo guarda como Mono en vez de como LSL." name="FSSaveInventoryScriptsAsMono_toggle"/>
+			<check_box label="Guardar texturas del inventario a disco como PNG en vez de TGA por defecto" tool_tip="Utilizado en la ventana de previsualización de textura y en el menú contextual en el inventario." name="FSTextureDefaultSaveAsFormat"/>
+			<check_box label="Usar Ctrl+ratón para sujetar y manipular objetos" tool_tip="Si lo activas, podrás tomar y mover objetos con tu ratón y la tecla CTRL." name="FSEnableGrab"/>
+			<check_box label="Permitir Bloq. Mayús. + arrastrar o escalar en una cara de textura en modo de construcción" tool_tip="Si lo activas, permite pulsar-arrastrar o pulsar-escalar de la textura de una cara en el modo de construcción. Esta característica es todavía experimental y debe ser usada con precaución." name="FSExperimentalDragTexture"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
index 943fd27a..73e06da8 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Sonidos" name="Preference Media panel">
-	<tab_container label="Prefs. Firestorm" name="tabs">
+	<tab_container label="Prefs. Puma" name="tabs">
 		<panel label="General" name="Media Sounds Panel">
 			<slider label="Volumen general" name="System Volume"/>
 			<check_box label="Silenciar al minimizar" name="mute_when_minimized"/>
@@ -89,7 +89,7 @@
 				Aquí puedes cambiar (mediante UUIDs) los sonidos por defecto de la interfaz.
 Sitúa el cursor del ratón sobre el campo de UUID para mostrar su valor por defecto.
 			</text>
-			<text tool_tip="Sonido a reproducir por las alertas por defecto de Firestorm." name="textFSSndAlert">
+			<text tool_tip="Sonido a reproducir por las alertas por defecto de Puma." name="textFSSndAlert">
 				Alerta por defecto:
 			</text>
 			<button name="Prev_UISndAlert" label="P" tool_tip="Probar sonido."/>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index c083bc90..d773af03 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -4,16 +4,16 @@
 		[CURRENT_GRID]
 	</string>
 	<string name="APP_NAME">
-		Firestorm
+		Puma
 	</string>
 	<string name="CAPITALIZED_APP_NAME">
-		FIRESTORM
+		PUMA
 	</string>
 	<string name="SECOND_LIFE_GRID">
 		Red de Second Life
 	</string>
 	<string name="SUPPORT_SITE">
-		Portal de Soporte de Firestorm
+		Portal de Soporte de Puma
 	</string>
 	<string name="StartupDetectingHardware">
 		Identificando el hardware...
@@ -188,11 +188,11 @@ Versión del servidor de voz: [VOICE_VERSION]
 		Salir
 	</string>
 	<string name="create_account_url">
-		https://www.firestormviewer.org/join-secondlife/
+		https://ayudavirtual.org/unirseasl/
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
-https://www.firestormviewer.org/choose-your-platform/
+https://wiki.avataresargentinos.com.ar/descargas/
  
 Si deseas obtener más información, consulta las preguntas frecuentes que aparecen a continuación:
 http://secondlife.com/viewer-access-faq
@@ -6076,20 +6076,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="render_quality_highultra">Alta-Ultra (6/7)</string>
 	<string name="render_quality_ultra">Ultra (7/7)</string>
 	<string name="render_quality_unknown">Desconocida, por encima del rango normal, comprueba la configuración del depurador RenderQualityPerformance</string>
-	<string name="fsbridge_cant_create_disabled">Firestorm no puede crear el LSL bridge si "Activar el LSL-Client Bridge" está desactivado en Preferencias.</string>
-	<string name="fsbridge_no_library">Firestorm no ha podido crear un LSL bridge. Por favor, activa tu librería y vuelve a iniciar sesión.</string>
-	<string name="fsbridge_already_creating">Creación del bridge en curso, no se puede iniciar otra. Por favor espera unos minutos antes de volverlo a intentar.</string>
-	<string name="fsbridge_creating">Creando el bridge. Puede tardar un momento, por favor espera.</string>
-	<string name="fsbridge_failure_creation_bad_name">No se ha creado el bridge. El bridge tiene un nombre incorrecto. Por favor, usa Avatar -> Salud del avatar -> Regenerar el LSL Bridge para crearlo de nuevo.</string>
-	<string name="fsbridge_failure_creation_null">No se ha creado el bridge. No se ha podido encontrar el bridge en el inventario. Por favor, usa Avatar -> Salud del avatar -> Regenerar el LSL Bridge para crearlo de nuevo.</string>
-	<string name="fsbridge_failure_attach_wrong_object">El bridge no ha podido ser anexado a tu avatar. No es la versión actual del bridge. Por favor, usa Avatar -> Salud del avatar -> Regenerar el LSL Bridge para crearlo de nuevo.</string>
-	<string name="fsbridge_failure_attach_wrong_location">El bridge no ha podido ser anexado a tu avatar. No se encontró el bridge en el lugar adecuado del inventario. Por favor, usa Avatar -> Salud del avatar -> Regenerar el LSL Bridge para crearlo de nuevo.</string>
-	<string name="fsbridge_failure_attach_point_in_use">El bridge no ha podido ser anexado a tu avatar. Algo está usando el punto de anclaje del bridge. Por favor, usa Avatar -> Salud del avatar -> Regenerar el LSL Bridge para crearlo de nuevo.</string>
-	<string name="fsbridge_failure_not_found">No se ha podido encontrar el objeto del bridge. No se puede proceder a su creación. Saliendo.</string>
-	<string name="fsbridge_warning_unexpected_items">El inventario del bridge contiene items inesperados.</string>
-	<string name="fsbridge_warning_not_finished">El bridge no se terminó de crear. Puede que tengas que usar Avatar -> Salud del avatar -> Regenerar el LSL Bridge para crearlo de nuevo antes de usarlo.</string>
-	<string name="fsbridge_detached">Bridge quitado.</string>
-	<string name="fsbridge_created">Bridge creado.</string>
 	<string name="QP Draw Distance">Distancia de dibujo</string>
 	<string name="QP Max Particles"># máx. partículas</string>
 	<string name="QP Avatar Physics LOD">Detalle física av.</string>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml
index 7570adbd..45157eba 100644
--- a/indra/newview/skins/default/xui/it/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences.xml
@@ -20,8 +20,8 @@
 		<panel label="Interfaccia" name="ui"/>
 		<panel label="Skin del Viewer" name="skins" />
 		<panel label="Segnala Crash" name="crashreports" />
-		<panel label="Firestorm" name="firestorm" />
-		<panel label="OpenSim" name="opensim" />
+		<panel label="Puma" name="firestorm" />
+		<panel label="Grids" name="opensim" />
 		<panel label="Backup e Ripristino" name="backup" />
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
index f46438a1..30ff7c2b 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
@@ -215,18 +215,18 @@ https://accounts.secondlife.com/change_email/
          help_topic="preferences_crashreports_tab"
          name="crashreports" />
         <panel
-         class="panel_preference_firestorm"
-         filename="panel_preferences_firestorm.xml"
-         label="Firestorm"
+         class="panel_preference_puma"
+         filename="panel_preferences_puma.xml"
+         label="Puma"
          layout="topleft"
-         help_topic="preferences_firestorm_tab"
-         name="firestorm" />
+         help_topic="preferences_puma_tab"
+         name="puma" />
         <panel
-         class="panel_preference_opensim"
-         filename="panel_preferences_opensim.xml"
-         label="Opensim"
+         class="panel_preference_grids"
+         filename="panel_preferences_grids.xml"
+         label="Grids"
          layout="topleft"
-         help_topic="preferences_opensim_tab"
+         help_topic="preferences_grids_tab"
          name="opensim" />
         <panel
          class="panel_preference_backup"
diff --git a/indra/newview/skins/vintage/xui/en/floater_preferences.xml b/indra/newview/skins/vintage/xui/en/floater_preferences.xml
index 1fccc74b..ca875020 100644
--- a/indra/newview/skins/vintage/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_preferences.xml
@@ -198,19 +198,19 @@ https://accounts.secondlife.com/change_email/
          help_topic="preferences_crashreports_tab"
          name="crashreports" />
         <panel
-         class="panel_preference_firestorm"
-         filename="panel_preferences_firestorm.xml"
-         label="Firestorm"
+         class="panel_preference_puma"
+         filename="panel_preferences_puma.xml"
+         label="Puma"
          layout="topleft"
-         help_topic="preferences_firestorm_tab"
-         name="firestorm" />
+         help_topic="preferences_puma_tab"
+         name="puma" />
         <panel
-         class="panel_preference_opensim"
-         filename="panel_preferences_opensim.xml"
-         label="Opensim"
+         class="panel_preference_grids"
+         filename="panel_preferences_grids.xml"
+         label="Grids"
          layout="topleft"
-         help_topic="preferences_opensim_tab"
-         name="opensim" />
+         help_topic="preferences_grids_tab"
+         name="grids" />
         <panel
          class="panel_preference_backup"
          filename="panel_preferences_backup.xml"