From 4ac17041d34e54323e91ed705065a054e1dae2d8 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 16 Oct 2010 23:11:23 -0700
Subject: Added 'Clear History' button to the Teleport History from Phoenix

---
 linden/indra/newview/llfloaterteleporthistory.cpp        | 16 +++++++++++++++-
 linden/indra/newview/llfloaterteleporthistory.h          |  3 +++
 .../skins/default/xui/en-us/floater_teleport_history.xml |  6 +++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/linden/indra/newview/llfloaterteleporthistory.cpp b/linden/indra/newview/llfloaterteleporthistory.cpp
index 65675fa..c901029 100644
--- a/linden/indra/newview/llfloaterteleporthistory.cpp
+++ b/linden/indra/newview/llfloaterteleporthistory.cpp
@@ -108,6 +108,7 @@ BOOL LLFloaterTeleportHistory::postBuild()
 	childSetAction("teleport", onTeleport, this);
 	childSetAction("show_on_map", onShowOnMap, this);
 	childSetAction("copy_slurl", onCopySLURL, this);
+	childSetAction("clear_history", onClearHistory,this);
 	loadEntrys();
 
 	return TRUE;
@@ -121,7 +122,13 @@ void LLFloaterTeleportHistory::saveEntry(LLSD toSave)
 	LLSDSerialize::toPrettyXML(tpList, file);
 	file.close();
 }
-
+void LLFloaterTeleportHistory::clearHistory()
+{
+	tpList.clear();
+	saveEntry(tpList);
+	mPlacesOutList->clearRows();
+	mPlacesInList->clearRows();
+}
 std::string LLFloaterTeleportHistory::getFileName()
 {
 	std::string path=gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "");
@@ -303,6 +310,13 @@ void LLFloaterTeleportHistory::onTeleport(void* data)
 }
 
 // static
+void LLFloaterTeleportHistory::onClearHistory(void* data)
+{
+	LLFloaterTeleportHistory* self = (LLFloaterTeleportHistory*) data;
+	self->clearHistory();
+}
+
+// static
 void LLFloaterTeleportHistory::onShowOnMap(void* data)
 {
 	LLFloaterTeleportHistory* self = (LLFloaterTeleportHistory*) data;
diff --git a/linden/indra/newview/llfloaterteleporthistory.h b/linden/indra/newview/llfloaterteleporthistory.h
index e458259..702daf5 100644
--- a/linden/indra/newview/llfloaterteleporthistory.h
+++ b/linden/indra/newview/llfloaterteleporthistory.h
@@ -63,9 +63,12 @@ class LLFloaterTeleportHistory : public LLFloater
 		/// @brief: adds a teleport destination to the list of visited places
 		void addEntry(std::string regionName, S16 x, S16 y, S16 z,bool outList);
 
+		void clearHistory();
+
 	protected:
 		static void onInPlacesSelected(LLUICtrl* ctrl, void* data);
 		static void onOutPlacesSelected(LLUICtrl* ctrl, void* data);
+		static void onClearHistory(void* data);
 		static void onTeleport(void* data);
 		static void onShowOnMap(void* data);
 		static void onCopySLURL(void* data);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
index db36df5..13956e2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-		min_width="500" min_height="250" width="500" height="250" name="teleporthistory"
+		min_width="600" min_height="250" width="600" height="250" name="teleporthistory"
 		rect_control="FloaterTeleportHistoryRect" title="Teleport History">
 	<tab_container label="TPlistTabs" bottom="40" height="185" left="5" follows="left|top|right|bottom" mouse_opaque="false" name="tplisttabs"
 	     tab_min_width="50" tab_position="top" width="480" right="-10" bg_opaque_color="0,0,0,0.0">
@@ -39,6 +39,10 @@
 		height="20" label="Show On Map" label_selected="Show On Map"
 		left_delta="100" mouse_opaque="true" name="show_on_map"
 		tool_tip="Center map on this location" width="125" />
+	<button bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerif" halign="center"
+		height="20" label="Clear History"
+		left_delta="135" mouse_opaque="true" name="clear_history"
+		tool_tip="Clear Saved Teleport History" width="125" />
 	<button bottom_delta="0" enabled="false" follows="bottom|right" font="SansSerif"
 		height="20" label="Copy SLURL to clipboard" left="-190" name="copy_slurl"
 		tool_tip="Copies current location as SLURL to be used on the web."
-- 
cgit v1.1