diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-08-04 15:44:45 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-08-04 15:44:45 -0700 |
commit | 6f256e2d57d6814fdb97809405989c54ab148c6b (patch) | |
tree | 0584e6231bf80e9919e7bf30caceece94b25deb4 /indra/newview/app_settings | |
parent | a97bcb7c7fd705818b7f36af2c4a915e85ff5604 (diff) | |
parent | eefe3388da83ce3e368af28ba466c27644f156c8 (diff) |
Merge with dessie/viewer-release
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 803901dafc..4fa183ceac 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4678,7 +4678,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>https://www.xstreetsl.com/modules.php?name=Marketplace</string> + <string>http://marketplace.secondlife.com/</string> </map> <key>MarketplaceURL_objectFemale</key> <map> @@ -4733,7 +4733,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>https://www.xstreetsl.com/modules.php?name=Marketplace</string> + <string>http://marketplace.secondlife.com</string> </map> <key>MarketplaceURL_bodypartMale</key> <map> @@ -4744,7 +4744,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>https://www.xstreetsl.com/modules.php?name=Marketplace</string> + <string>http://marketplace.secondlife.com/</string> </map> <key>MarketplaceURL_glovesMale</key> <map> @@ -11913,5 +11913,16 @@ <key>Value</key> <integer>1</integer> </map> + <key>TipToastMessageLineCount</key> + <map> + <key>Comment</key> + <string>Max line count of text message on tip toast.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>10</integer> + </map> </map> </llsd> |