summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-11 09:22:56 -0500
committerOz Linden <oz@lindenlab.com>2010-11-11 09:22:56 -0500
commitfc22e2cf5bfc97caaf1ad69814b7dd217cbafef0 (patch)
tree8ac101cbfb2b3a47dff9cc4b33b95013feba3c66 /indra/newview/app_settings
parent024e5ff23542cf0604b73901311bb4d024957b1c (diff)
parentee8df375449e97476408417ec6dea0d6a8853d73 (diff)
merge fix for STORM-559
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml26
1 files changed, 24 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3f23fee865..ebd93b5987 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -35,6 +35,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>ActiveFloaterTransparency</key>
+ <map>
+ <key>Comment</key>
+ <string>Transparency of active floaters (floaters that have focus)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.95</real>
+ </map>
<key>AdvanceSnapshot</key>
<map>
<key>Comment</key>
@@ -1161,13 +1172,13 @@
<key>CacheNumberOfRegionsForObjects</key>
<map>
<key>Comment</key>
- <string>Controls number of regions to be cached for objects, ranges from 16 to 128.</string>
+ <string>Controls number of regions to be cached for objects.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>128</integer>
+ <integer>20000</integer>
</map>
<key>CacheSize</key>
<map>
@@ -3986,6 +3997,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>InactiveFloaterTransparency</key>
+ <map>
+ <key>Comment</key>
+ <string>Transparency of inactive floaters (floaters that have no focus)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.5</real>
+ </map>
<key>InBandwidth</key>
<map>
<key>Comment</key>