From ca51e8f33dfa0cd455438f11902fb1d839bf6206 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 27 Jul 2009 16:50:01 +0000
Subject: Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog
 layout changes. svn merge -r128075:128364
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8

---
 indra/newview/llteleporthistory.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview/llteleporthistory.h')

diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h
index c68aabe9a1..775b21e24c 100644
--- a/indra/newview/llteleporthistory.h
+++ b/indra/newview/llteleporthistory.h
@@ -106,7 +106,7 @@ public:
 	 * @return history items.
 	 */
 	const slurl_list_t&		getItems() const { return mItems; }
-	
+	void                    purgeItems();
 	/**
 	 * Is the history empty?
 	 * 
@@ -119,7 +119,6 @@ public:
 	 * Get index of the current location in the history.
 	 */
 	int						getCurrentItemIndex() const { return mCurrentItem; }
-	
 	/**
 	 * Set a callback to be called upon history changes.
 	 * 
-- 
cgit v1.2.3