VWR-21253 MERGE Permission icons in the friends list

1 files changed, 28 insertions, 0 deletions

diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index e252e69ea9..e89b85ac8a 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -36,6 +36,7 @@
 #include "llcallingcard.h" // for LLFriendObserver
 
 class LLAvatarIconCtrl;
+class LLIconCtrl;
 
 class LLAvatarListItem : public LLPanel, public LLFriendObserver
 {
@@ -94,6 +95,7 @@ public:
 	void setShowProfileBtn(bool show);
 	void setShowInfoBtn(bool show);
 	void showSpeakingIndicator(bool show);
+	void setShowPermissions(bool show) { mShowPermissions = show; };
 	void showLastInteractionTime(bool show);
 	void setAvatarIconVisible(bool visible);
 	
@@ -113,6 +115,15 @@ protected:
 
 	LLAvatarIconCtrl* mAvatarIcon;
 
+	/// Indicator for permission to see me online.
+	LLIconCtrl* mPermissionOnline;
+	/// Indicator for permission to see my position on the map.
+	LLIconCtrl* mPermissionMap;
+	/// Indicator for permission to edit my objects.
+	LLIconCtrl* mPermissionEditMine;
+	/// Indicator for permission to edit their objects.
+	LLIconCtrl* mPermissionEditTheirs;
+
 private:
 
 	typedef enum e_online_status {
@@ -132,6 +143,10 @@ private:
 		ALIC_SPEAKER_INDICATOR,
 		ALIC_PROFILE_BUTTON,
 		ALIC_INFO_BUTTON,
+		ALIC_PERMISSION_EDIT_THEIRS,
+		ALIC_PERMISSION_EDIT_MINE,
+		ALIC_PERMISSION_MAP,
+		ALIC_PERMISSION_ONLINE,
 		ALIC_INTERACTION_TIME,
 		ALIC_NAME,
 		ALIC_ICON,
@@ -159,6 +174,13 @@ private:
 	void updateChildren();
 
 	/**
+	 * Update visibility of active permissions icons.
+	 *
+	 * Need to call updateChildren() afterwards to sort out their layout.
+	 */
+	bool showPermissions(bool visible);
+
+	/**
 	 * Gets child view specified by index.
 	 *
 	 * This method implemented via switch by all EAvatarListItemChildIndex values.
@@ -181,6 +203,12 @@ private:
 	bool mShowInfoBtn;
 	bool mShowProfileBtn;
 
+	/// indicates whether to show icons representing permissions granted
+	bool mShowPermissions;
+
+	/// true when the mouse pointer is hovering over this item
+	bool mHovered;
+
 	static bool	sStaticInitialized; // this variable is introduced to improve code readability
 	static S32  sLeftPadding; // padding to first left visible child (icon or name)
 	static S32  sRightNamePadding; // right padding from name to next visible child