svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134

1 files changed, 15 insertions, 9 deletions

diff --git a/indra/newview/llfloaterfriends.h b/indra/newview/llfloaterfriends.h
index 3d0b7a9bba..46e4eaaf79 100644
--- a/indra/newview/llfloaterfriends.h
+++ b/indra/newview/llfloaterfriends.h
@@ -40,6 +40,7 @@
 #include "lltimer.h"
 
 class LLFriendObserver;
+class LLRelationship;
 
 
 /** 
@@ -88,19 +89,27 @@ private:
 		LIST_VISIBLE_ONLINE,
 		LIST_VISIBLE_MAP,
 		LIST_EDIT_MINE,
-		LIST_EDIT_THEIRS
+		LIST_EDIT_THEIRS,
+		LIST_FRIEND_UPDATE_GEN
 	};
 
 	// protected members
-
+	typedef std::map<LLUUID, S32> rights_map_t;
 	void reloadNames();
 	void refreshNames();
 	void refreshUI();
 	void refreshRightsChangeList();
-	void applyRightsToFriends(S32 flag, BOOL value);
-	void updateMenuState(S32 flag, BOOL value);
-	S32 getMenuState() { return mMenuState; }
+	void applyRightsToFriends();
 	void addFriend(const std::string& name, const LLUUID& agent_id);	
+	void updateFriendItem(LLScrollListItem* itemp, const LLRelationship* relationship);
+
+	typedef enum 
+	{
+		GRANT,
+		REVOKE
+	} EGrantRevoke;
+	void confirmModifyRights(rights_map_t& ids, EGrantRevoke command);
+	void sendRightsGrant(rights_map_t& ids);
 
 	// return LLUUID::null if nothing is selected
 	LLDynamicArray<LLUUID> getSelectedIDs();
@@ -119,12 +128,10 @@ private:
 	static void onClickOfferTeleport(void* user_data);
 	static void onClickPay(void* user_data);
 
-	static void onClickOnlineStatus(LLUICtrl* ctrl, void* user_data);
-	static void onClickMapStatus(LLUICtrl* ctrl, void* user_data);
 	static void onClickModifyStatus(LLUICtrl* ctrl, void* user_data);
 
 	static void handleRemove(S32 option, void* user_data);
-	static void handleModifyRights(S32 option, void* user_data);
+	static void modifyRightsConfirmation(S32 option, void* user_data);
 
 private:
 	// member data
@@ -132,7 +139,6 @@ private:
 	LLUUID mAddFriendID;
 	LLString mAddFriendName;
 	LLScrollListCtrl*			mFriendsList;
-	S32		mMenuState;
 	BOOL mShowMaxSelectWarning;
 	BOOL mAllowRightsChange;
 	S32 mNumRightsChanged;