summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-05-25 14:48:09 -0700
committerRichard Linden <none@none>2010-05-25 14:48:09 -0700
commitb0bdde3ee307e144d9047521fce84c318b0fc789 (patch)
tree226860f78d30bd438a0b9fca2a9f94013c643188 /indra/newview/app_settings
parenta91d10dc1806d1931c7f1361bfcf70df59d982d5 (diff)
parent208d935e8f22b03178648dec4bc579a3468232f9 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml17
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f79693586a..ab7c0f2f15 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -24,7 +24,7 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>AgentPause</key>
+ <key>AgentPause</key>
<map>
<key>Comment</key>
<string>Ask the simulator to stop updating the agent while enabled</string>
@@ -5971,7 +5971,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.2</real>
+ <real>0.125</real>
</map>
<key>MediaRollOffMin</key>
<map>
@@ -5982,7 +5982,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>7.0</real>
+ <real>5.0</real>
</map>
<key>MediaRollOffMax</key>
<map>
@@ -9086,6 +9086,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>TextureDiscardLevel</key>
+ <map>
+ <key>Comment</key>
+ <string>Specify texture resolution (0 = highest, 5 = lowest)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>TextureLoadFullRes</key>
<map>
<key>Comment</key>