diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-10-13 15:17:51 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-13 15:17:51 -0700 |
commit | 4c663ca8b997bd74fb3b646c3cb3870555dfeb91 (patch) | |
tree | 7edea4e2b1970083f9e8b92e9097bc340ff0dd61 /indra/newview/app_settings | |
parent | 6b7ea2f198e9ec721b6e01aaeba3b6c7a44db7d2 (diff) |
EXP-1314 FIX -- No floater for Marketplace
EXP-1338 FIX -- Clicking on active Toybox buttons triggers clicking sound
EXP-1339 FIX -- No minimum resize dimension for Place floater
EXP-1340 FIX -- No minimum resize demension for Appearance floater
EXP-1341 FIX -- Places Floater doesn't have Help button
* Toybox buttons no longer have click sounds
* Marketplace button opens external browser to marketplace url
* Minimum sizes for places and appearance floaters
* Marketplace URL's now all use https
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/commands.xml | 5 | ||||
-rw-r--r-- | indra/newview/app_settings/settings.xml | 70 |
2 files changed, 36 insertions, 39 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index e4aaca1bd0..c83494df25 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -116,10 +116,7 @@ icon="Command_Marketplace_Icon" label_ref="Command_Marketplace_Label" tooltip_ref="Command_Marketplace_Tooltip" - execute_function="Floater.ToggleOrBringToFront" - execute_parameters="marketplace" - is_running_function="Floater.IsOpen" - is_running_parameters="marketplace" + execute_function="Avatar.OpenMarketplace" /> <command name="minimap" available_in_toybox="true" diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2dbf9e714b..da2161c8de 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5094,7 +5094,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/</string> + <string>https://marketplace.secondlife.com/</string> </map> <key>MarketplaceURL_objectFemale</key> <map> @@ -5105,7 +5105,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/attachments</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/attachments</string> </map> <key>MarketplaceURL_objectMale</key> <map> @@ -5116,7 +5116,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/attachments</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/attachments</string> </map> <key>MarketplaceURL_clothingFemale</key> <map> @@ -5127,7 +5127,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/clothing_female_avatar</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/clothing_female_avatar</string> </map> <key>MarketplaceURL_clothingMale</key> <map> @@ -5138,7 +5138,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/clothing_male_avatar</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/clothing_male_avatar</string> </map> <key>MarketplaceURL_bodypartFemale</key> <map> @@ -5149,7 +5149,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com</string> + <string>https://marketplace.secondlife.com/</string> </map> <key>MarketplaceURL_bodypartMale</key> <map> @@ -5160,7 +5160,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/</string> + <string>https://marketplace.secondlife.com/</string> </map> <key>MarketplaceURL_glovesMale</key> <map> @@ -5171,7 +5171,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/gloves_both_women_and_men</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/gloves_both_women_and_men</string> </map> <key>MarketplaceURL_glovesFemale</key> <map> @@ -5182,7 +5182,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/gloves_both_women_and_men</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/gloves_both_women_and_men</string> </map> <key>MarketplaceURL_jacketFemale</key> <map> @@ -5193,7 +5193,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/jacket_womens</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/jacket_womens</string> </map> <key>MarketplaceURL_jacketMale</key> <map> @@ -5204,7 +5204,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/jacket_mens</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/jacket_mens</string> </map> <key>MarketplaceURL_shirtFemale</key> <map> @@ -5215,7 +5215,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/shirt_womens</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/shirt_womens</string> </map> <key>MarketplaceURL_shirtMale</key> <map> @@ -5226,7 +5226,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/shirt_mens</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/shirt_mens</string> </map> <key>MarketplaceURL_undershirtFemale</key> <map> @@ -5237,7 +5237,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/undershirt_womens</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/undershirt_womens</string> </map> <key>MarketplaceURL_undershirtMale</key> <map> @@ -5248,7 +5248,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/undershirt_mens</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/undershirt_mens</string> </map> <key>MarketplaceURL_skirtFemale</key> <map> @@ -5259,7 +5259,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/skirts_women</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/skirts_women</string> </map> <key>MarketplaceURL_skirtMale</key> <map> @@ -5270,7 +5270,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/skirts_women</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/skirts_women</string> </map> <key>MarketplaceURL_pantsFemale</key> <map> @@ -5281,7 +5281,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/pants_women</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/pants_women</string> </map> <key>MarketplaceURL_pantsMale</key> <map> @@ -5292,7 +5292,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/pants_men</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/pants_men</string> </map> <key>MarketplaceURL_underpantsFemale</key> <map> @@ -5303,7 +5303,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/underwear_women</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/underwear_women</string> </map> <key>MarketplaceURL_underpantsMale</key> <map> @@ -5314,7 +5314,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/underwear_men</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/underwear_men</string> </map> <key>MarketplaceURL_shoesFemale</key> <map> @@ -5325,7 +5325,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/shoes_women</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/shoes_women</string> </map> <key>MarketplaceURL_shoesMale</key> <map> @@ -5336,7 +5336,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/shoes_men</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/shoes_men</string> </map> <key>MarketplaceURL_socksFemale</key> <map> @@ -5347,7 +5347,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/socks_women</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/socks_women</string> </map> <key>MarketplaceURL_socksMale</key> <map> @@ -5358,7 +5358,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/socks_women</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/socks_women</string> </map> <key>MarketplaceURL_tattooMale</key> <map> @@ -5369,7 +5369,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/tattoo_both_women_and_men</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/tattoo_both_women_and_men</string> </map> <key>MarketplaceURL_tattooFemale</key> <map> @@ -5380,7 +5380,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/tattoo_both_women_and_men</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/tattoo_both_women_and_men</string> </map> <key>MarketplaceURL_hairFemale</key> <map> @@ -5391,7 +5391,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_hair</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/womens_hair</string> </map> <key>MarketplaceURL_hairMale</key> <map> @@ -5402,7 +5402,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_hair</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/mens_hair</string> </map> <key>MarketplaceURL_eyesFemale</key> <map> @@ -5413,7 +5413,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_eyes</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/womens_eyes</string> </map> <key>MarketplaceURL_eyesMale</key> <map> @@ -5424,7 +5424,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_eyes</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/mens_eyes</string> </map> <key>MarketplaceURL_shapeFemale</key> <map> @@ -5435,7 +5435,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_shape</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/womens_shape</string> </map> <key>MarketplaceURL_shapeMale</key> <map> @@ -5446,7 +5446,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_shape</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/mens_shape</string> </map> <key>MarketplaceURL_skinFemale</key> <map> @@ -5457,7 +5457,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_skin</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/womens_skin</string> </map> <key>MarketplaceURL_skinMale</key> <map> @@ -5468,7 +5468,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_skin</string> + <string>https://marketplace.secondlife.com/trampoline/viewer21/mens_skin</string> </map> <key>MaxDragDistance</key> <map> |