diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-12 13:46:21 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-12 13:46:21 -0500 |
commit | dc8a9dc57d41723338a0881a29c5652924977ccf (patch) | |
tree | 272cd5624749a1ff720ad9674412060c33978cdb /indra/newview/llvoicechannel.h | |
parent | 1e76fc2b1f4e735105f2d45d73ea5a92dbad4e05 (diff) | |
parent | 6e0ebfe18c431465f6d1bc52e079c7a745419de5 (diff) |
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; |