summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-09-08 10:55:48 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-09-08 10:55:48 -0700
commit1c7b1532e994f8c4d1c69e419e34f07c1a9ee918 (patch)
treeff5b60dbc6887a7a7420728a06804fa268720211 /indra/newview/app_settings
parent82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (diff)
parent78821c51a1f7d5fcc6e4a2678bfd3446ccfaee36 (diff)
Merge from viewer-experience
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
-rw-r--r--indra/newview/app_settings/settings_per_account.xml4
2 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6ebb0162a4..7ab9f36b87 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4281,6 +4281,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>InventoryMarketplaceUserStatus</key>
+ <map>
+ <key>Comment</key>
+ <string>Marketplace user status.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string />
+ </map>
<key>InventorySortOrder</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 1142f01232..c7140283f1 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -33,10 +33,10 @@
<key>Value</key>
<string />
</map>
- <key>LastInventoryInboxExpand</key>
+ <key>LastInventoryInboxActivity</key>
<map>
<key>Comment</key>
- <string>The last time the received items inbox was expanded.</string>
+ <string>The last time the received items inbox was poked by the user.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>