diff options
| author | Gilbert Gonzales <username@lindenlab.com> | 2012-08-31 11:48:03 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <username@lindenlab.com> | 2012-08-31 11:48:03 -0700 |
| commit | 383f370884e052074932f954477dec10289c64f3 (patch) | |
| tree | cd9a1dad2e5c69ace2a2582eba150f6a0e40b071 /indra/newview/llvoicechannel.h | |
| parent | 461550a8ff492dadd026d68949ef732d447bf592 (diff) | |
| parent | 73769180f363556d5517e3070fc4a2ac61e713d6 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llvoicechannel.h')
| -rw-r--r-- | indra/newview/llvoicechannel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h index b8597ee5cb..fed44974fd 100644 --- a/indra/newview/llvoicechannel.h +++ b/indra/newview/llvoicechannel.h @@ -52,7 +52,7 @@ public: OUTGOING_CALL } EDirection; - typedef boost::signals2::signal<void(const EState& old_state, const EState& new_state, const EDirection& direction, bool ended_by_agent)> state_changed_signal_t; + typedef boost::signals2::signal<void(const EState& old_state, const EState& new_state, const EDirection& direction, bool ended_by_agent, const LLUUID& session_id)> state_changed_signal_t; // on current channel changed signal typedef boost::function<void(const LLUUID& session_id)> channel_changed_callback_t; |