diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
| commit | 0e06dc8964d5ae31fccb2da522d05d822530d3c7 (patch) | |
| tree | d15dfd4ab9dfc4724efe62373cbca6a24c97006b /indra/newview/app_settings | |
| parent | 4c9760a073853ae81a78aa99119c059cdfaba664 (diff) | |
| parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) | |
Merge from dessie/viewer-release
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 1f50f18516..1500d613e9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4666,7 +4666,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> @@ -4721,7 +4721,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> @@ -4732,7 +4732,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> @@ -11901,16 +11901,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> |