summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationview.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llconversationview.h')
-rwxr-xr-xindra/newview/llconversationview.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h
index cc6995c207..1baa8bb5ec 100755
--- a/indra/newview/llconversationview.h
+++ b/indra/newview/llconversationview.h
@@ -94,7 +94,7 @@ private:
bool mMinimizedMode;
LLVoiceClientStatusObserver* mVoiceClientObserver;
-
+
boost::signals2::connection mActiveVoiceChannelConnection;
};
@@ -116,11 +116,12 @@ public:
Params();
};
- virtual ~LLConversationViewParticipant( void ) { }
+ virtual ~LLConversationViewParticipant( void );
bool hasSameValue(const LLUUID& uuid) { return (uuid == mUUID); }
virtual void refresh();
void addToFolder(LLFolderViewFolder* folder);
+ void addToSession(const LLUUID& session_id);
/*virtual*/ BOOL handleMouseDown( S32 x, S32 y, MASK mask );
@@ -140,6 +141,8 @@ protected:
void onInfoBtnClick();
private:
+ void onCurrentVoiceSessionChanged(const LLUUID& session_id);
+
LLAvatarIconCtrl* mAvatarIcon;
LLButton * mInfoBtn;
LLOutputMonitorCtrl* mSpeakingIndicator;
@@ -156,6 +159,8 @@ private:
static void initChildrenWidths(LLConversationViewParticipant* self);
void updateChildren();
LLView* getItemChildView(EAvatarListItemChildIndex child_view_index);
+
+ boost::signals2::connection mActiveVoiceChannelConnection;
};
#endif // LL_LLCONVERSATIONVIEW_H