diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-14 16:01:14 -0800 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-12-14 16:01:14 -0800 |
commit | 68b61bdec620014f30d6e9c63726d96fa7f4382a (patch) | |
tree | 3e63525c14ee4dbedde471528e00fc62544f434b /indra/newview/llconversationview.h | |
parent | 177737fa342602530345d1450277dd1048c077bd (diff) |
CHUI-520: Now when have a P2P conversation torn off a voice indicator icon will be displayed allowing the user to adjust the voice volume when clicked. Also did a code cleanup on conversationview.h/cpp which was showing the speaking indicator icon too soon when joining another voice session. This was due to calling switchIndicator(..) directly inside ::onCurrentVoiceSessionChanged. The proper solution is to wait for SpeeakingIndicatorManager::switchSpeakerIndicators() call switchIndicators().
Diffstat (limited to 'indra/newview/llconversationview.h')
-rwxr-xr-x | indra/newview/llconversationview.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h index fb2834f26a..a9333020e9 100755 --- a/indra/newview/llconversationview.h +++ b/indra/newview/llconversationview.h @@ -146,7 +146,6 @@ protected: void onInfoBtnClick(); private: - void onCurrentVoiceSessionChanged(const LLUUID& session_id); LLAvatarIconCtrl* mAvatarIcon; LLButton * mInfoBtn; |