Second Life viewer sources 1.22.2-RC

1 files changed, 14 insertions, 14 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 9dac926..1ebe77a 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -165,17 +165,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>AsyncKeyboard</key>
-    <map>
-      <key>Comment</key>
-      <string>Improves responsiveness to keyboard input when at low framerates</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>AuctionShowFence</key>
     <map>
       <key>Comment</key>
@@ -3971,7 +3960,18 @@
       <key>Value</key>
       <real>0.0</real>
     </map>
-    <key>InventoryAutoOpenDelay</key>
+        <key>InstallLanguage</key>
+        <map>
+                <key>Comment</key>
+                <string>Language passed from installer (for UI)</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>String</string>
+                <key>Value</key>
+                <string>default</string>
+        </map>
+        <key>InventoryAutoOpenDelay</key>
     <map>
       <key>Comment</key>
       <string>Seconds before automatically opening inventory when mouse is over inventory button when performing inventory drag and drop</string>
@@ -4210,7 +4210,7 @@
     <key>Language</key>
     <map>
       <key>Comment</key>
-      <string>Language specifier (for XUI)</string>
+      <string>Language specifier (for UI)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -7659,7 +7659,7 @@
     <key>SystemLanguage</key>
     <map>
       <key>Comment</key>
-      <string>Language indicated by system settings (for XUI)</string>
+      <string>Language indicated by system settings (for UI)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>