diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-06 11:00:47 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-06 11:00:47 -0400 |
commit | 2d8b53854ebc1db5cceda1e1b5d6abbbc6c08728 (patch) | |
tree | 56388b12b66b42059841faeadac6f110abc18d21 /indra/newview/app_settings | |
parent | e0cb5438a5055c71191c6ae6b27c7dee63e40562 (diff) | |
parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 46 | ||||
-rwxr-xr-x | indra/newview/app_settings/settings_per_account.xml | 13 |
2 files changed, 57 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 87381428ff..a03221c902 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4878,6 +4878,17 @@ <key>Value</key> <integer>7</integer> </map> + <key>InventoryTrashMaxCapacity</key> + <map> + <key>Comment</key> + <string>Maximum capacity of the Trash folder. User will ve offered to clean it up when exceeded.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>5000</integer> + </map> <key>MarketplaceListingsSortOrder</key> <map> <key>Comment</key> @@ -7026,6 +7037,28 @@ <key>Value</key> <integer>1</integer> </map> + <key>NotifyMoneySpend</key> + <map> + <key>Comment</key> + <string>Pop up notifications when spending L$</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> + <key>NotifyMoneyReceived</key> + <map> + <key>Comment</key> + <string>Pop up notifications when receiving L$</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>NotifyTipDuration</key> <map> <key>Comment</key> @@ -8193,6 +8226,17 @@ <key>Value</key> <integer>256</integer> </map> + <key>RegionCheckTextureHeights</key> + <map> + <key>Comment</key> + <string>Don't allow user to set low heights greater than high</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>RememberPassword</key> <map> <key>Comment</key> @@ -14479,7 +14523,7 @@ <key>Type</key> <string>U32</string> <key>Value</key> - <integer>25</integer> + <integer>1</integer> </map> <key>PoolSizeUpload</key> <map> diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index c62b45ed81..fd6b1b5b3f 100755 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -98,7 +98,18 @@ <string>Boolean</string> <key>Value</key> <integer>1</integer> - </map> + </map> + <key>NavigationBarRatio</key> + <map> + <key>Comment</key> + <string>The ratio between the width of Navigation layout panel and the width of whole Navigation layout stack</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.6</real> + </map> <key>InstantMessageLogPath</key> <map> <key>Comment</key> |