diff options
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llpanelplaces.cpp | 18 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_places.xml | 7 |
2 files changed, 24 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 1713370692..9c67ec40fe 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -659,6 +659,15 @@ void LLPanelPlaces::onTabSelected() // favorites and inventory can remove items, history can clear history childSetVisible("trash_btn_panel", TRUE); + + if (supports_create) + { + mRemoveSelectedBtn->setToolTip(getString("tooltip_trash_items")); + } + else + { + mRemoveSelectedBtn->setToolTip(getString("tooltip_trash_history")); + } } void LLPanelPlaces::onTeleportButtonClicked() @@ -1230,6 +1239,15 @@ void LLPanelPlaces::createTabs() // favorites and inventory can remove items, history can clear history childSetVisible("trash_btn_panel", TRUE); + if (supports_create) + { + mRemoveSelectedBtn->setToolTip(getString("tooltip_trash_items")); + } + else + { + mRemoveSelectedBtn->setToolTip(getString("tooltip_trash_history")); + } + mActivePanel->setRemoveBtn(mRemoveSelectedBtn); mActivePanel->updateVerbs(); } diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index dd4cf7ab4e..58be4d4c5e 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -20,6 +20,12 @@ background_visible="true" <string name="favorites_tab_title" value="FAVORITES" /> + <string + name="tooltip_trash_items" + value="Remove selected landmark or folder" /> + <string + name="tooltip_trash_history" + value="Delete list of visited places" /> <layout_stack animate="false" border_size="0" @@ -146,7 +152,6 @@ background_visible="true" left="0" layout="topleft" name="trash_btn" - tool_tip="Remove selected landmark or folder" top="0" width="31"/> </layout_panel> |