diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-25 13:29:30 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-25 13:29:30 +0300 |
commit | 8c83a6ca620c46a7df23ab6e567bfb29dc98d1a7 (patch) | |
tree | b137e30f11ca0ed48a5390a2edf5d9343543ab6e /indra/newview/app_settings | |
parent | 3ec7c76abee043d6b3bf419998a351523aee70d9 (diff) | |
parent | 2a99af8d949b982ea5832735c61ca249554f5b02 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/low_graphics.xml | 2 | ||||
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/app_settings/low_graphics.xml b/indra/newview/app_settings/low_graphics.xml index 3f67a70d7a..d02a13a671 100644 --- a/indra/newview/app_settings/low_graphics.xml +++ b/indra/newview/app_settings/low_graphics.xml @@ -4,6 +4,8 @@ <RenderAvatarCloth value="FALSE"/> <!--Default for now--> <RenderAvatarLODFactor value="0.5"/> + <!--Default for now--> + <RenderAvatarMaxVisible value="3"/> <!--NO SHADERS--> <RenderAvatarVP value="FALSE"/> <!--Short Range--> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6d8f417921..6d124cd0b8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6028,6 +6028,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>QuickBuyCurrency</key> + <map> + <key>Comment</key> + <string>Toggle between HTML based currency purchase floater and legacy XUI version</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>RegionTextureSize</key> <map> <key>Comment</key> |