diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-18 15:56:49 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-18 15:56:49 -0500 |
| commit | 1e922c266657d74e5a746334777917f4efaf7871 (patch) | |
| tree | 6ec595df9d8eb7e4d53947b7c930fc3afa60d73b /indra/newview/llcallfloater.h | |
| parent | efdfc74b21f5d6386cc03136c4d2a8dcf07f9958 (diff) | |
| parent | cf5acb6af6eb2b9fe93789f84cb593b9fbe480aa (diff) | |
Automated merge with ssh://nyx@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llcallfloater.h')
| -rw-r--r-- | indra/newview/llcallfloater.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index b2288a42ff..f9c9149085 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -70,6 +70,8 @@ public: */ /*virtual*/ void onChange(); + static void sOnCurrentChannelChanged(const LLUUID& session_id); + private: typedef enum e_voice_controls_type { @@ -93,7 +95,9 @@ private: * Refreshes participant list according to current Voice Channel */ void refreshPartisipantList(); - void onCurrentChannelChanged(const LLUUID& session_id); + + + void updateTitle(); void initAgentData(); void setModeratorMutedVoice(bool moderator_muted); @@ -108,8 +112,6 @@ private: LLPanel* mAgentPanel; LLOutputMonitorCtrl* mSpeakingIndicator; bool mIsModeratorMutedVoice; - - boost::signals2::connection mChannelChangedConnection; }; |