summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-05-06 18:09:03 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-05-06 18:09:03 +0000
commit068da0b5655fc3c735cd8019ab3b6bb0defec4c0 (patch)
tree143580a4ff29c4c4df91c41e1429add4abaa3f87 /indra/newview/app_settings
parenteb14fece837683ebc58540d7f10eb74f5a5fbd4e (diff)
merge release-QAR-511 Viewer 1.20 RC 5
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e954d97310..f1e4b39d7d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2855,7 +2855,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <string>0</string>
+ <integer>0</integer>
</map>
<key>JoystickFlycamEnabled</key>
<map>
@@ -6089,9 +6089,9 @@
<string>Color4</string>
<key>Value</key>
<array>
- <real>0.819999992847442626953125</real>
- <real>0.819999992847442626953125</real>
- <real>0.9900000095367431640625</real>
+ <real>0.8235294117</real>
+ <real>0.2745098039</real>
+ <real>0.2745098039</real>
<real>1</real>
</array>
</map>