diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-14 16:48:06 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-14 16:48:06 +0200 |
| commit | 86769b40aac266701b56daa6c78b924aad4d3ca9 (patch) | |
| tree | 708dbba9db728ebbb0fb5a411591403a170492b5 /indra/newview/llavatarlistitem.cpp | |
| parent | 6ad8674a8c5a87f438aa5ad6230396a859ba268e (diff) | |
Work on major bug EXT-3976 (Voice chat speaking indicators should only display when users are in the same voice channel)
-- implemented functionality to have voice indicator visible only for avatars in the same voice channel with agent
All speacking indicators should be registered in LLSpeakingIndicatorManager to be provcessed for the voice channel.
They should implement switchIndicator(bool) as reaction on voice state changing
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llavatarlistitem.cpp')
| -rw-r--r-- | indra/newview/llavatarlistitem.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index a2e17db3d8..0a0ad81165 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -127,6 +127,15 @@ BOOL LLAvatarListItem::postBuild() return TRUE; } +S32 LLAvatarListItem::notifyParent(const LLSD& info) +{ + if (info.has("visibility_changed")) + { + updateChildren(); + } + return 0; +} + void LLAvatarListItem::onMouseEnter(S32 x, S32 y, MASK mask) { childSetVisible("hovered_icon", true); @@ -246,8 +255,10 @@ void LLAvatarListItem::showSpeakingIndicator(bool visible) // Already done? Then do nothing. if (mSpeakingIndicator->getVisible() == (BOOL)visible) return; - mSpeakingIndicator->setVisible(visible); - updateChildren(); +// Disabled to not contradict with SpeakingIndicatorManager functionality. EXT-3976 +// probably this method should be totally removed. +// mSpeakingIndicator->setVisible(visible); +// updateChildren(); } void LLAvatarListItem::setAvatarIconVisible(bool visible) |