QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release

merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456

2 files changed, 22 insertions, 6 deletions

diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 746e56d821..db665b72dd 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -187,6 +187,8 @@
       </string>

       <key>count</key>

       <integer>2</integer>

+      <key>compose</key>

+      <boolean>true</boolean>

       <!-- Special case. Mapped to settings procedurally. -->

     </map>

 

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0269e25658..8ca74f6d0f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2868,7 +2868,7 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>FloaterHUDRect</key>
+    <key>FloaterHUDRect2</key>
     <map>
       <key>Comment</key>
       <string>Rectangle for HUD Floater window</string>
@@ -2877,10 +2877,13 @@
       <key>Type</key>
       <string>Rect</string>
       <key>Value</key>
+<!-- NOTE: Height and width must match values in settings.xml for 
+     FloaterHUDRect because this floater is resized to those values
+     in LLViewerWindow initialization. JC -->
       <array>
         <integer>0</integer>
-        <integer>282</integer>
-        <integer>342</integer>
+        <integer>292</integer>
+        <integer>362</integer>
         <integer>0</integer>
       </array>
     </map>
@@ -7185,16 +7188,16 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>SkinFolder</key>
+    <key>SkinCurrent</key>
     <map>
       <key>Comment</key>
-      <string>The skin folder to use.</string>
+      <string>The currently selected skin.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string />
+      <string>default</string>
     </map>
     <key>SkyAmbientScale</key>
     <map>
@@ -7766,6 +7769,17 @@
         <integer>4</integer>
       </array>
     </map>
+    <key>TutorialURL</key>
+    <map>
+      <key>Comment</key>
+      <string>URL for tutorial menu item, set automatically during login</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string />
+    </map>
     <key>TypeAheadTimeout</key>
     <map>
       <key>Comment</key>