diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 10:58:20 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 10:58:20 +0000 |
commit | fc1af768b800c890cda8ef3e8b9ee2537ca1d92a (patch) | |
tree | 40474e1e2ee190cae30603ce960e58238929c445 /indra/newview/llvoicechannel.h | |
parent | 4805c9bea7a0f316dbb95bd04b5b0cec7052602e (diff) | |
parent | de7ca5abb26930025b16c7f50aa7469c3b33c09e (diff) |
PE merge.
Diffstat (limited to 'indra/newview/llvoicechannel.h')
-rw-r--r-- | indra/newview/llvoicechannel.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h index cb86671305..941cccacc3 100644 --- a/indra/newview/llvoicechannel.h +++ b/indra/newview/llvoicechannel.h @@ -58,7 +58,7 @@ public: OUTGOING_CALL } EDirection; - typedef boost::signals2::signal<void(const EState& old_state, const EState& new_state, const EDirection& direction)> state_changed_signal_t; + typedef boost::signals2::signal<void(const EState& old_state, const EState& new_state, const EDirection& direction, bool ended_by_agent)> state_changed_signal_t; // on current channel changed signal typedef boost::function<void(const LLUUID& session_id)> channel_changed_callback_t; @@ -122,6 +122,8 @@ protected: std::string mSessionName; LLSD mNotifyArgs; LLSD mCallDialogPayload; + // true if call was ended by agent + bool mCallEndedByAgent; BOOL mIgnoreNextSessionLeave; LLHandle<LLPanel> mLoginNotificationHandle; |