Merge from 2.1 Alpha tag

2 files changed, 52 insertions, 515 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 810b2d9a1d..864a79c38a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" ?>
 <llsd>
 <map>
-	<key>CrashHostUrl</key>
-    <map>
-      <key>Comment</key>
-      <string>A URL pointing to a crash report handler; overrides cluster negotiation to locate crash handler.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string />
-    </map>
     <key>AFKTimeout</key>
     <map>
       <key>Comment</key>
@@ -585,7 +574,7 @@
       <key>Value</key>
       <integer>2</integer>
     </map>
-    <key>AvatarBakedTextureUploadTimeout</key>
+    <key>AvatarBakedTextureTimeout</key>
     <map>
       <key>Comment</key>
       <string>Specifes the maximum time in seconds to wait before sending your baked textures for avatar appearance.  Set to 0 to disable and wait until all baked textures are at highest resolution.</string>
@@ -594,20 +583,8 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>60</integer>
-    </map>
-    <key>AvatarBakedLocalTextureUpdateTimeout</key>
-    <map>
-      <key>Comment</key>
-      <string>Specifes the maximum time in seconds to wait before updating your appearance during appearance mode.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>U32</string>
-      <key>Value</key>
-      <integer>10</integer>
+      <integer>180</integer>
     </map>
-
     <key>AvatarSex</key>
     <map>
       <key>Comment</key>
@@ -2853,17 +2830,6 @@
         <key>Value</key>
         <integer>0</integer>
     </map>
-	<key>FeatureManagerHTTPTable</key>
-      <map>
-        <key>Comment</key>
-        <string>Base directory for HTTP feature/gpu table fetches</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>String</string>
-        <key>Value</key>
-        <string>http://viewer-settings.secondlife.com</string>
-    </map>
     <key>FPSLogFrequency</key>
     <map>
       <key>Comment</key>
@@ -3321,17 +3287,6 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
-    <key>FlycamBuildModeScale</key>
-    <map>
-      <key>Comment</key>
-      <string>Scale factor to apply to flycam movements when in build mode.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>1.0</real>
-    </map>
     <key>FlycamFeathering</key>
     <map>
       <key>Comment</key>
@@ -3579,17 +3534,6 @@
       <key>Value</key>
       <real>9.0</real>
     </map>
-    <key>ForceAssetFail</key>
-    <map>
-      <key>Comment</key>
-      <string>Force wearable fetches to fail for this asset type.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>U32</string>
-      <key>Value</key>
-      <integer>255</integer>
-    </map>
     <key>ForceShowGrid</key>
     <map>
       <key>Comment</key>
@@ -3623,6 +3567,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>FullScreen</key>
+    <map>
+      <key>Comment</key>
+      <string>Run SL in fullscreen mode</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>FullScreenAspectRatio</key>
     <map>
       <key>Comment</key>
@@ -3632,7 +3587,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>3</real>
+      <real>1.33329999447</real>
     </map>
     <key>FullScreenAutoDetectAspectRatio</key>
     <map>
@@ -3643,7 +3598,29 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
+    </map>
+    <key>FullScreenHeight</key>
+    <map>
+      <key>Comment</key>
+      <string>Fullscreen resolution in height</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>768</integer>
+    </map>
+    <key>FullScreenWidth</key>
+    <map>
+      <key>Comment</key>
+      <string>Fullscreen resolution in width</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>1024</integer>
     </map>
     <key>GesturesMarketplaceURL</key>
     <map>
@@ -4678,382 +4655,8 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/</string>
-    </map>
-    <key>MarketplaceURL_objectFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Attachments Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/attachments</string>
-    </map>
-    <key>MarketplaceURL_objectMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Attachments Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/attachments</string>
-    </map>
-    <key>MarketplaceURL_clothingFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Clothing Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/clothing_female_avatar</string>
-    </map>
-    <key>MarketplaceURL_clothingMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Clothing Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/clothing_male_avatar</string>
-    </map>
-    <key>MarketplaceURL_bodypartFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Bodyparts Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com</string>
-    </map>
-    <key>MarketplaceURL_bodypartMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Bodyparts Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/</string>
-    </map>
-    <key>MarketplaceURL_glovesMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Gloves Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/gloves_both_women_and_men</string>
-    </map>
-    <key>MarketplaceURL_glovesFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Gloves Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/gloves_both_women_and_men</string>
-    </map>
-    <key>MarketplaceURL_jacketFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Jacket Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/jacket_womens</string>
-    </map>
-    <key>MarketplaceURL_jacketMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Jacket Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/jacket_mens</string>
-    </map>
-    <key>MarketplaceURL_shirtFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Shirt Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/shirt_womens</string>
-    </map>
-    <key>MarketplaceURL_shirtMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Shirt Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/shirt_mens</string>
-    </map>
-    <key>MarketplaceURL_undershirtFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Undershirt Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/undershirt_womens</string>
-    </map>
-    <key>MarketplaceURL_undershirtMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Undershirt Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/undershirt_mens</string>
-    </map>
-    <key>MarketplaceURL_skirtFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Skirt Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/skirts_women</string>
-    </map>
-    <key>MarketplaceURL_skirtMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Skirt Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/skirts_women</string>
-    </map>
-    <key>MarketplaceURL_pantsFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Pants Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/pants_women</string>
-    </map>
-    <key>MarketplaceURL_pantsMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Pants Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/pants_men</string>
-    </map>
-    <key>MarketplaceURL_underpantsFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Underwear Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/underwear_women</string>
-    </map>
-    <key>MarketplaceURL_underpantsMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Underwear Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/underwear_men</string>
-    </map>
-    <key>MarketplaceURL_shoesFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Shoes Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/shoes_women</string>
-    </map>
-    <key>MarketplaceURL_shoesMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Shoes Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/shoes_men</string>
-    </map>
-    <key>MarketplaceURL_socksFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Socks Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/socks_women</string>
-    </map>
-    <key>MarketplaceURL_socksMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Socks Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/socks_women</string>
-    </map>
-    <key>MarketplaceURL_tattooMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Tattoo Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/tattoo_both_women_and_men</string>
-    </map>
-    <key>MarketplaceURL_tattooFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Tattoo Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/tattoo_both_women_and_men</string>
-    </map>
-    <key>MarketplaceURL_hairFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Hair Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_hair</string>
-    </map>
-    <key>MarketplaceURL_hairMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Hair Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_hair</string>
-    </map>
-    <key>MarketplaceURL_eyesFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Eyes Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_eyes</string>
-    </map>
-    <key>MarketplaceURL_eyesMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Eyes Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_eyes</string>
-    </map>
-    <key>MarketplaceURL_shapeFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Shape Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_shape</string>
-    </map>
-    <key>MarketplaceURL_shapeMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Shape Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_shape</string>
-    </map>
-    <key>MarketplaceURL_skinFemale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Skin Female</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_skin</string>
-    </map>
-    <key>MarketplaceURL_skinMale</key>
-    <map>
-      <key>Comment</key>
-      <string>URL to the Marketplace Skins Male</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_skin</string>
-    </map>
+      <string>https://www.xstreetsl.com/modules.php?name=Marketplace</string>
+    </map>    
     <key>MaxDragDistance</key>
     <map>
       <key>Comment</key>
@@ -5076,17 +4679,6 @@
       <key>Value</key>
       <real>64.0</real>
     </map>
-    <key>MaxWearableWaitTime</key>
-    <map>
-      <key>Comment</key>
-      <string>Max seconds to wait for wearable assets to fetch.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>60.0</real>
-    </map>
     <key>MeanCollisionBump</key>
     <map>
       <key>Comment</key>
@@ -5361,7 +4953,7 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
-    </map> 
+    </map>
     <key>MouseSun</key>
     <map>
       <key>Comment</key>
@@ -5373,18 +4965,7 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>MultipleAttachments</key>
-    <map>
-      <key>Comment</key>
-      <string>Allow multiple objects to be attached to a single attachment point.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-   <key>MuteAmbient</key>
+    <key>MuteAmbient</key>
     <map>
       <key>Comment</key>
       <string>Ambient sound effects, such as wind noise, play at 0 volume</string>
@@ -6621,7 +6202,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>12</integer>
+      <integer>35</integer>
     </map>
     <key>RenderAvatarVP</key>
     <map>
@@ -8196,17 +7777,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-  <key>RenderUseStreamVBO</key>
-  <map>
-    <key>Comment</key>
-    <string>Use VBO's for stream buffers</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
     <key>RenderVolumeLODFactor</key>
     <map>
       <key>Comment</key>
@@ -10933,7 +10503,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>UseStartScreen</key>
     <map>
@@ -11416,9 +10986,9 @@
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
-      <string>S32</string>
+      <string>Boolean</string>
       <key>Value</key>
-      <integer>-1</integer>
+      <integer>0</integer>
     </map>
     <key>WaterEditPresets</key>
     <map>
@@ -11847,38 +11417,5 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>OutfitOperationsTimeout</key>
-    <map>
-      <key>Comment</key>
-      <string>Timeout for outfit related operations.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>180</integer>
-    </map>
-    <key>HeightUnits</key>
-    <map>
-      <key>Comment</key>
-      <string>Determines which metric units are used: 1(TRUE) for meter and 0(FALSE) for foot.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>TipToastMessageLineCount</key>
-    <map>
-      <key>Comment</key>
-      <string>Max line count of text message on tip toast.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>10</integer>
-    </map>
 </map>
 </llsd>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index dc76a4e518..d4000e9253 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -1,26 +1,26 @@
 <llsd>
     <map>
-    <key>BusyResponseChanged</key>
+    <key>BusyModeResponse</key>
         <map>
         <key>Comment</key>
-            <string>Does user's busy mode message differ from default?</string>
+            <string>Auto response to instant messages while in busy mode.</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>
-            <string>Boolean</string>
+            <string>String</string>
         <key>Value</key>
-            <integer>0</integer>
+            <string>The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
         </map>
-    <key>BusyModeResponse</key>
+    <key>BusyModeResponse2</key>
         <map>
         <key>Comment</key>
-            <string>Auto response to instant messages while in busy mode.</string>
+            <string>Auto response to instant messages while in busy mode, clean (unencoded) version of BusyModeResponse</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>
             <string>String</string>
         <key>Value</key>
-            <string>The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+            <string>|TOKEN COPY BusyModeResponse|</string>
         </map>
     <key>InstantMessageLogPath</key>
         <map>