From dcbdb1fee553dd3877447b659e35e158fabc0c47 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 22 Jul 2010 17:35:35 +0100 Subject: EXT-1579 FIXED Show icons representing permissions granted in friends list on roll-over. Needs new icon artwork, currently reusing old 1.23 icons. --- indra/newview/llavatarlistitem.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'indra/newview/llavatarlistitem.h') 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, @@ -158,6 +173,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. * @@ -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 -- cgit v1.2.3 From 073d56b0e1fb1a53c5c5079b1dbcf53c877c0d42 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Fri, 10 Sep 2010 11:49:50 +0100 Subject: VWR-21253 SUPPLEMENTARY Permission icons in the friends list Incorporate code review feedback. --- indra/newview/llavatarlistitem.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llavatarlistitem.h') diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index e89b85ac8a..ffb988b2ab 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -116,13 +116,13 @@ protected: LLAvatarIconCtrl* mAvatarIcon; /// Indicator for permission to see me online. - LLIconCtrl* mPermissionOnline; + LLIconCtrl* mIconPermissionOnline; /// Indicator for permission to see my position on the map. - LLIconCtrl* mPermissionMap; + LLIconCtrl* mIconPermissionMap; /// Indicator for permission to edit my objects. - LLIconCtrl* mPermissionEditMine; + LLIconCtrl* mIconPermissionEditMine; /// Indicator for permission to edit their objects. - LLIconCtrl* mPermissionEditTheirs; + LLIconCtrl* mIconPermissionEditTheirs; private: -- cgit v1.2.3