diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-02 18:59:35 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-02 18:59:35 +0300 |
commit | 3b7da511179fd2e2e734a4f3137ac8813a5eebee (patch) | |
tree | 6642492a8be25cf36de2712d019e31f1681ac9ea /indra/newview/app_settings | |
parent | 122209c4a61ce00bc6157c7ae0b9311930f4410b (diff) | |
parent | d1094573117db0a951a7e6159a352b0f4c8a8a24 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 810b2d9a1d..c2236233dc 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>http://marketplace.secondlife.com/</string> + <string>https://www.xstreetsl.com/modules.php?name=Marketplace</string> </map> <key>MarketplaceURL_objectFemale</key> <map> @@ -4733,7 +4733,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com</string> + <string>https://www.xstreetsl.com/modules.php?name=Marketplace</string> </map> <key>MarketplaceURL_bodypartMale</key> <map> @@ -4744,7 +4744,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/</string> + <string>https://www.xstreetsl.com/modules.php?name=Marketplace</string> </map> <key>MarketplaceURL_glovesMale</key> <map> @@ -11869,16 +11869,5 @@ <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> |