From 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 19 Feb 2008 21:42:32 +0000
Subject: merge
 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986
 : 80178 -> release.

QAR-290 = QAR-271 + QAR-191
---
 indra/newview/llfloaterfriends.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/llfloaterfriends.h b/indra/newview/llfloaterfriends.h
index 46e4eaaf79..2e87688f8e 100644
--- a/indra/newview/llfloaterfriends.h
+++ b/indra/newview/llfloaterfriends.h
@@ -41,7 +41,8 @@
 
 class LLFriendObserver;
 class LLRelationship;
-
+class LLScrollListItem;
+class LLScrollListCtrl;
 
 /** 
  * @class LLPanelFriends
@@ -100,8 +101,8 @@ private:
 	void refreshUI();
 	void refreshRightsChangeList();
 	void applyRightsToFriends();
-	void addFriend(const std::string& name, const LLUUID& agent_id);	
-	void updateFriendItem(LLScrollListItem* itemp, const LLRelationship* relationship);
+	BOOL addFriend(const LLUUID& agent_id);	
+	BOOL updateFriendItem(const LLUUID& agent_id, const LLRelationship* relationship);
 
 	typedef enum 
 	{
@@ -138,7 +139,7 @@ private:
 	LLFriendObserver* mObserver;
 	LLUUID mAddFriendID;
 	LLString mAddFriendName;
-	LLScrollListCtrl*			mFriendsList;
+	LLScrollListCtrl* mFriendsList;
 	BOOL mShowMaxSelectWarning;
 	BOOL mAllowRightsChange;
 	S32 mNumRightsChanged;
-- 
cgit v1.2.3