From dc8cd05082e4d82a578d4a20278725cdf5e0450f Mon Sep 17 00:00:00 2001 From: Andrew Polunin Date: Sat, 19 Dec 2009 18:35:38 +0200 Subject: implemented minor task EXT-3455 Code Improvements: Improve LLAvatarListItem not to calculate constant values in each constructing --HG-- branch : product-engine --- indra/newview/llavatarlistitem.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/newview/llavatarlistitem.h') diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index aa1b7593f5..1272bdf7a9 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -135,10 +135,12 @@ private: //Speaker indicator and avatar name coords are translated accordingly bool mShowInfoBtn; bool mShowProfileBtn; - S32 mIconWidth; // icon width + padding - S32 mInfoBtnWidth; //info btn width + padding - S32 mProfileBtnWidth; //profile btn width + padding - S32 mSpeakingIndicatorWidth; //speaking indicator width + padding + + static bool mStaticInitialized; // this variable is introduced to improve code readability + static S32 mIconWidth; // icon width + padding + static S32 mInfoBtnWidth; //info btn width + padding + static S32 mProfileBtnWidth; //profile btn width + padding + static S32 mSpeakingIndicatorWidth; //speaking indicator width + padding }; #endif //LL_LLAVATARLISTITEM_H -- cgit v1.2.3 From 368c75ccd367320c650dbfdb62fdb3334e888f8a Mon Sep 17 00:00:00 2001 From: Andrew Polunin Date: Sat, 19 Dec 2009 18:52:14 +0200 Subject: no ticket. static variables renamed according to convention. --HG-- branch : product-engine --- indra/newview/llavatarlistitem.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llavatarlistitem.h') diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index 1272bdf7a9..df8b04126e 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -136,11 +136,11 @@ private: bool mShowInfoBtn; bool mShowProfileBtn; - static bool mStaticInitialized; // this variable is introduced to improve code readability - static S32 mIconWidth; // icon width + padding - static S32 mInfoBtnWidth; //info btn width + padding - static S32 mProfileBtnWidth; //profile btn width + padding - static S32 mSpeakingIndicatorWidth; //speaking indicator width + padding + static bool sStaticInitialized; // this variable is introduced to improve code readability + static S32 sIconWidth; // icon width + padding + static S32 sInfoBtnWidth; //info btn width + padding + static S32 sProfileBtnWidth; //profile btn width + padding + static S32 sSpeakingIndicatorWidth; //speaking indicator width + padding }; #endif //LL_LLAVATARLISTITEM_H -- cgit v1.2.3 From 7bfb8ec0503d7c31d9241b2e95f103fa66b14e1e Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Mon, 21 Dec 2009 20:42:34 +0200 Subject: Work on normal bug EXT-3434 There is no difference between invited and left participants in a Group call (Voice Controls) -- implemented decorating of left participants in voice chat via italic font style (draft, harcoded) --HG-- branch : product-engine --- indra/newview/llavatarlistitem.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llavatarlistitem.h') diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index df8b04126e..ad85d5fa87 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -73,6 +73,7 @@ public: void setOnline(bool online); void setName(const std::string& name); void setHighlight(const std::string& highlight); + void setStyle(const LLStyle::Params& new_style); void setAvatarId(const LLUUID& id, bool ignore_status_changes = false); void setLastInteractionTime(U32 secs_since); //Show/hide profile/info btn, translating speaker indicator and avatar name coordinates accordingly -- cgit v1.2.3 From 7d308294e93c7d2a0ffb3f1b88386b96fcb7b42d Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Mon, 21 Dec 2009 20:45:27 +0200 Subject: Removed unused code (context menu handling in LLAvatarListItem). --HG-- branch : product-engine --- indra/newview/llavatarlistitem.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/newview/llavatarlistitem.h') diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index ad85d5fa87..0e058f75db 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -92,8 +92,6 @@ public: void showInfoBtn(bool show_info_btn) {mInfoBtn->setVisible(show_info_btn); } void showLastInteractionTime(bool show); - void setContextMenu(ContextMenu* menu) { mContextMenu = menu; } - /** * This method was added to fix EXT-2364 (Items in group/ad-hoc IM participant list (avatar names) should be reshaped when adding/removing the "(Moderator)" label) * But this is a *HACK. The real reason of it was in incorrect logic while hiding profile/info/speaker buttons @@ -127,7 +125,6 @@ private: LLButton* mInfoBtn; LLButton* mProfileBtn; - ContextMenu* mContextMenu; LLUUID mAvatarId; std::string mHighlihtSubstring; // substring to highlight -- cgit v1.2.3