diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-30 16:38:49 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-30 16:38:49 +0300 |
| commit | 7d3183d32d3c626a7e5f673d4f4950fbe12d02d7 (patch) | |
| tree | d3e0045d8d54980cd339a9a0e8b36969330b5e67 | |
| parent | f4285a2ffb8baa911fac4ae0f505128a985a750b (diff) | |
| parent | 4bf3bda2ab07e58e8f5ffdf460e72530f3b37691 (diff) | |
merge
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llpaneloutfitsinventory.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 9 |
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> |