diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-08 20:16:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-08 20:16:35 -0400 |
| commit | 093fdcfcd3debd74dc773bf52faa07ea9f5f8b31 (patch) | |
| tree | 9b3a0f7e37ef731cb9d35ef4e87c17a4c3c4b255 /indra/newview/llpanelimcontrolpanel.h | |
| parent | 187bc5211437718016a22e60c7b5ed29823c8510 (diff) | |
| parent | 255fc0401ebde80cfde88995a18fc77a36e3479b (diff) | |
merge changes for storm-1489
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.h')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h index 3bbe24ecb9..bba847b5d4 100644 --- a/indra/newview/llpanelimcontrolpanel.h +++ b/indra/newview/llpanelimcontrolpanel.h @@ -54,7 +54,7 @@ public: virtual void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state); - void updateButtons(bool is_call_started); + void updateButtons(LLVoiceChannel::EState state); // Enables/disables call button depending on voice availability void updateCallButton(); @@ -94,6 +94,12 @@ private: void onPayButtonClicked(); void onFocusReceived(); + void onClickMuteVolume(); + void onClickBlock(); + void onClickUnblock(); + /*virtual*/ void draw(); + void onVolumeChange(const LLSD& data); + LLUUID mAvatarID; }; |