From 3a8053eb9fc0db52b9fb5ae02f1807acbb4e072d Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 11 Feb 2019 19:01:28 +0200 Subject: SL-10351 Fixed Avatars muted by Group moderator become Blocked forever --- indra/newview/llconversationview.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llconversationview.h') diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h index 5a74974302..06ffb517bb 100644 --- a/indra/newview/llconversationview.h +++ b/indra/newview/llconversationview.h @@ -136,6 +136,7 @@ public: virtual ~LLConversationViewParticipant( void ); bool hasSameValue(const LLUUID& uuid) { return (uuid == mUUID); } + /*virtual*/ void refresh(); void addToFolder(LLFolderViewFolder* folder); void addToSession(const LLUUID& session_id); -- cgit v1.2.3 From 3b3e4833ad41993785ea2fcae651b588df8e492d Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 5 Mar 2019 20:14:21 +0200 Subject: SL-10686 Refresh indicators on session change, fix visibility --- indra/newview/llconversationview.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llconversationview.h') diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h index 06ffb517bb..420c250dfe 100644 --- a/indra/newview/llconversationview.h +++ b/indra/newview/llconversationview.h @@ -90,6 +90,7 @@ public: void setHighlightState(bool hihglight_state); LLFloater* getSessionFloater(); + bool isInActiveVoiceChannel() { return mIsInActiveVoiceChannel; } private: @@ -145,7 +146,7 @@ public: /*virtual*/ S32 getLabelXPos(); /*virtual*/ BOOL handleMouseDown( S32 x, S32 y, MASK mask ); - void hideSpeakingIndicator(); + void allowSpeakingIndicator(bool val); protected: friend class LLUICtrlFactory; -- cgit v1.2.3