diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-15 16:09:17 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-15 16:09:17 -0400 |
commit | 92fa144dcea4cbb6426b895cf5359da0c90eb4ae (patch) | |
tree | fc9f7dd3f875be8d50cc13050664b1f43ed0a93f /indra/newview/app_settings/settings.xml | |
parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
parent | b2d20f5a989bde2c4db90091bec37d310cc346fc (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 27598c9aac..60025707a4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4059,7 +4059,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]</string> + <string>http://search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD]</string> </map> <key>WebProfileURL</key> <map> @@ -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> |