summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-06-30 15:05:02 +0300
committerAndrew Dyukov <adyukov@productengine.com>2010-06-30 15:05:02 +0300
commit4bf3bda2ab07e58e8f5ffdf460e72530f3b37691 (patch)
tree711992c459a4b772ea2a651d5fe0167dafbf5332 /indra
parentfc732b34b28fc556f0a3a37c7f0d353dd6e1b424 (diff)
EXT-7793 FIXED Implemented "Wear" button tooltip changing depending on selection.
- Added check to LLPanelOutfitsInventory::updateListCommands() which takes place on selection change and depending on hasItemSelected() sets tooltip for "Wear" button. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/665/ --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpaneloutfitsinventory.cpp8
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfits_inventory.xml9
2 files changed, 16 insertions, 1 deletions
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index 462ba2dfa5..c5d259e517 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -262,6 +262,14 @@ void LLPanelOutfitsInventory::updateListCommands()
mListCommands->childSetEnabled("wear_btn", wear_enabled);
mListCommands->childSetVisible("wear_btn", wear_visible);
mSaveComboBtn->setMenuItemEnabled("save_outfit", make_outfit_enabled);
+ if (mMyOutfitsPanel->hasItemSelected())
+ {
+ mListCommands->childSetToolTip("wear_btn", getString("wear_items_tooltip"));
+ }
+ else
+ {
+ mListCommands->childSetToolTip("wear_btn", getString("wear_outfit_tooltip"));
+ }
}
void LLPanelOutfitsInventory::showGearMenu()
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 23592d2fc1..82b69ba8dc 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -12,6 +12,14 @@
min_width="240"
width="320"
border="false">
+ <panel.string
+ name="wear_outfit_tooltip">
+ Wear selected outfit
+ </panel.string>
+ <panel.string
+ name="wear_items_tooltip">
+ Wear selected items
+ </panel.string>
<tab_container
follows="all"
height="539"
@@ -89,7 +97,6 @@
layout="topleft"
name="wear_btn"
left_pad="3"
- tool_tip="Wear selected outfit"
width="152" />
</panel>
</panel>