5 files changed, 14 insertions, 19 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 90a70adea7..ac7bc0fc32 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -656,7 +656,9 @@ void LLPanelPlaces::onTabSelected()
     // Hide menus
     bool supports_create = mActivePanel->getCreateMenu() != NULL;
     childSetVisible("add_btn_panel", supports_create);
-    childSetVisible("trash_btn_panel", supports_create);
+
+    // favorites and inventory can remove items, history can clear history
+    childSetVisible("trash_btn_panel", TRUE);
 }
 
 void LLPanelPlaces::onTeleportButtonClicked()
@@ -1224,7 +1226,9 @@ void LLPanelPlaces::createTabs()
         // Hide menus
         bool supports_create = mActivePanel->getCreateMenu() != NULL;
         childSetVisible("add_btn_panel", supports_create);
-        childSetVisible("trash_btn_panel", supports_create);
+
+        // favorites and inventory can remove items, history can clear history
+        childSetVisible("trash_btn_panel", TRUE);
     }
 
 	mTabsCreated = true;
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 48614e1e47..7a3d3525ac 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -534,6 +534,12 @@ void LLTeleportHistoryPanel::onTeleport()
 	confirmTeleport(itemp->getIndex());
 }
 
+// virtual
+void LLTeleportHistoryPanel::onRemoveSelected()
+{
+    LLNotificationsUtil::add("ConfirmClearTeleportHistory", LLSD(), LLSD(), boost::bind(&LLTeleportHistoryPanel::onClearTeleportHistoryDialog, this, _1, _2));
+}
+
 /*
 // virtual
 void LLTeleportHistoryPanel::onCopySLURL()
@@ -1032,10 +1038,6 @@ void LLTeleportHistoryPanel::onGearMenuAction(const LLSD& userdata)
             mLastSelectedFlatlList->resetSelection();
         }
     }
-    else if ("clear_history" == command_name)
-    {
-        LLNotificationsUtil::add("ConfirmClearTeleportHistory", LLSD(), LLSD(), boost::bind(&LLTeleportHistoryPanel::onClearTeleportHistoryDialog, this, _1, _2));
-    }
 
     S32 index = -1;
     if (mLastSelectedFlatlList)
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h
index f76dc139bd..058fee0170 100644
--- a/indra/newview/llpanelteleporthistory.h
+++ b/indra/newview/llpanelteleporthistory.h
@@ -54,7 +54,7 @@ public:
     void onShowProfile() override;
     void onTeleport() override;
     ///*virtual*/ void onCopySLURL();
-    void onRemoveSelected() override {};
+    void onRemoveSelected() override;
     void updateVerbs() override;
     bool isSingleItemSelected() override;
 
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
index f60f02f040..153e5a70a9 100644
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
@@ -49,15 +49,4 @@
          function="TeleportHistory.GearMenu.Enable"
          parameter="copy_slurl" />
     </menu_item_call>
-    <menu_item_separator layout="topleft" />
-    <menu_item_call
-     label="Clear Teleport History"
-     name="Clear Teleport History">
-      <menu_item_call.on_click
-       function="TeleportHistory.GearMenu.Action"
-       parameter="clear_history" />
-      <on_enable
-       function="TeleportHistory.GearMenu.Enable"
-       parameter="clear_history" />
-    </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 87a702faab..0cf0376ef8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8710,7 +8710,7 @@ This upload will cost L$[PRICE], do you wish to continue with the upload?
    icon="alertmodal.tga"
    name="ConfirmClearTeleportHistory"
    type="alertmodal">
-Are you sure you want to delete your teleport history?
+This will delete the entire list of places you have visited, and cannot be undone. Continue?
   <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"