QAR-449 Viewer 1.20 RC 1

merge Branch_1-20-Viewer -r 84432 : 84760 -> release

2 files changed, 58 insertions, 18 deletions

diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index 43c3d85679..3e6fa21cc6 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -169,10 +169,9 @@
     <key>setdefault</key>
     <map>
       <key>desc</key>
-      <string>
-        "specify the value of a particular\n
-        configuration variable which can be\n
-        overridden by settings.xml\n"
+      <string> specify the value of a particular
+               configuration variable which can be
+               overridden by settings.xml
       </string>
       <key>count</key>
       <integer>2</integer>
@@ -182,10 +181,9 @@
     <key>set</key>
     <map>
       <key>desc</key>
-      <string>
-        "specify the value of a particular\n
-        configuration variable that\n
-        overrides all other settings\n"
+      <string> specify the value of a particular
+               configuration variable that
+               overrides all other settings
       </string>
       <key>count</key>
       <integer>2</integer>
@@ -239,8 +237,6 @@
     <map>
       <key>desc</key>
       <string>Allow multple viewers.</string>
-      <key>count</key>
-      <integer>1</integer>
       <key>map-to</key>
       <string>AllowMultipleViewers</string>
     </map>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2754b27234..1c421b343a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -74,7 +74,7 @@
         <key>Type</key>
             <string>Boolean</string>
         <key>Value</key>
-            <integer>1</integer>
+            <integer>0</integer>
         </map>
     <key>AnimateTextures</key>
         <map>
@@ -2829,12 +2829,56 @@
         <key>Comment</key>
             <string>Whether or not a joystick has been detected and initiailized.</string>
         <key>Persist</key>
-            <integer>1</integer>
+            <integer>0</integer>
         <key>Type</key>
             <string>String</string>
         <key>Value</key>
             <string></string>
         </map>
+    <key>JoystickEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables Joystick Input.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <string>0</string>
+        </map>
+    <key>JoystickFlycamEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables the Joystick to control the flycam.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <string>1</string>
+        </map>
+    <key>JoystickAvatarEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables the Joystick to control Avatar movmement.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <string>1</string>
+        </map>
+    <key>JoystickBuildEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables the Joystick to move edited objects.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <string>1</string>
+        </map>
     <key>JoystickAxis0</key>
         <map>
         <key>Comment</key>
@@ -2844,7 +2888,7 @@
         <key>Type</key>
             <string>S32</string>
         <key>Value</key>
-            <integer>0</integer>
+            <integer>1</integer>
         </map>
     <key>JoystickAxis1</key>
         <map>
@@ -2855,7 +2899,7 @@
         <key>Type</key>
             <string>S32</string>
         <key>Value</key>
-            <integer>2</integer>
+            <integer>0</integer>
         </map>
     <key>JoystickAxis2</key>
         <map>
@@ -2866,7 +2910,7 @@
         <key>Type</key>
             <string>S32</string>
         <key>Value</key>
-            <integer>1</integer>
+            <integer>2</integer>
         </map>
     <key>JoystickAxis3</key>
         <map>
@@ -2877,7 +2921,7 @@
         <key>Type</key>
             <string>S32</string>
         <key>Value</key>
-            <integer>5</integer>
+            <integer>4</integer>
         </map>
     <key>JoystickAxis4</key>
         <map>
@@ -2888,7 +2932,7 @@
         <key>Type</key>
             <string>S32</string>
         <key>Value</key>
-            <integer>4</integer>
+            <integer>3</integer>
         </map>
     <key>JoystickAxis5</key>
         <map>
@@ -2899,7 +2943,7 @@
         <key>Type</key>
             <string>S32</string>
         <key>Value</key>
-            <integer>3</integer>
+            <integer>5</integer>
         </map>
     <key>JoystickAxis6</key>
         <map>