summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-13 15:17:51 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-13 15:17:51 -0700
commit4c663ca8b997bd74fb3b646c3cb3870555dfeb91 (patch)
tree7edea4e2b1970083f9e8b92e9097bc340ff0dd61 /indra/newview/skins/default
parent6b7ea2f198e9ec721b6e01aaeba3b6c7a44db7d2 (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/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_my_appearance.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_places.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_toybox.xml1
3 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
index 758a1d5be9..74c4e22841 100644
--- a/indra/newview/skins/default/xui/en/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
@@ -11,6 +11,8 @@
save_rect="true"
single_instance="true"
title="APPEARANCE"
+ min_height="230"
+ min_width="333"
width="333">
<panel
top="18"
diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml
index 0c22f2d6ea..b7cb86b468 100644
--- a/indra/newview/skins/default/xui/en/floater_places.xml
+++ b/indra/newview/skins/default/xui/en/floater_places.xml
@@ -7,8 +7,11 @@
height="588"
layout="topleft"
name="floater_places"
+ help_topic="floater_places"
save_rect="true"
title="PLACES"
+ min_height="230"
+ min_width="333"
width="333">
<panel
top="18"
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index fbc16352ea..c7e09bf45e 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -76,6 +76,7 @@
flash_color="ButtonUnselectedFgColor"
halign="left"
hover_glow_amount="0.15"
+ sound_flags="0"
display_pressed_state="false" />
</toolbar>
<panel