diff options
| author | James Cook <james@lindenlab.com> | 2010-05-25 11:41:33 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-25 11:41:33 -0700 |
| commit | a91d10dc1806d1931c7f1361bfcf70df59d982d5 (patch) | |
| tree | 20f2940d888aaf71c54ff1e7834cbf79a3617216 /indra/newview/app_settings | |
| parent | d6ea42984553b7adb6f26cf2ed094d32e36814d2 (diff) | |
| parent | f682c996d28c3841b6709f8fc67ba443bfcd1926 (diff) | |
Merge
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 | 77 |
2 files changed, 35 insertions, 44 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 02e47ffa40..f79693586a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4591,6 +4591,17 @@ <key>Value</key> <string /> </map> + <key>MarketplaceURL</key> + <map> + <key>Comment</key> + <string>URL to the Marketplace</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>https://www.xstreetsl.com/modules.php?name=Marketplace</string> + </map> <key>MaxDragDistance</key> <map> <key>Comment</key> @@ -6017,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> @@ -8173,17 +8195,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>ShowCameraButton</key> - <map> - <key>Comment</key> - <string>Show/Hide Camera button in the bottom tray</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>ShowScriptErrors</key> <map> <key>Comment</key> @@ -8206,39 +8217,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>ShowSnapshotButton</key> - <map> - <key>Comment</key> - <string>Show/Hide Snapshot button button in the bottom tray</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>ShowMoveButton</key> - <map> - <key>Comment</key> - <string>Show/Hide Move button in the bottom tray</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>ShowGestureButton</key> - <map> - <key>Comment</key> - <string>Show/Hide Gesture button in the bottom tray</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>ShowObjectRenderingCost</key> <map> <key>Comment</key> @@ -8759,6 +8737,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>SidebarWithButtonsVisibility</key> + <map> + <key>Comment</key> + <string>Sets visibility of sidebar with its tabs' buttons</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>SkinCurrent</key> <map> <key>Comment</key> |