diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/newview/llfloaterfriends.h | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
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
Diffstat (limited to 'indra/newview/llfloaterfriends.h')
| -rw-r--r-- | indra/newview/llfloaterfriends.h | 9 |
1 files changed, 5 insertions, 4 deletions
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; |