Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui

1 files changed, 6 insertions, 1 deletions

diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h
index d528c77e8d..24a8f17feb 100644
--- a/indra/newview/llimfloater.h
+++ b/indra/newview/llimfloater.h
@@ -90,7 +90,8 @@ public:
 	void updateMessages();
 	void reloadMessages();
 	static void onSendMsg(LLUICtrl*, void*);
-	void sendMsg();
+	void sendMsgFromInputEditor();
+	void sendMsg(const std::string& msg);
 
 	// callback for LLIMModel on new messages
 	// route to specific floater if it is visible
@@ -162,6 +163,8 @@ private:
 	void setTyping(bool typing);
 	void onAddButtonClicked();
 	void addSessionParticipants(const uuid_vec_t& uuids);
+	void addP2PSessionParticipants(const LLSD& notification, const LLSD& response, const uuid_vec_t& uuids);
+	void sendParticipantsAddedNotification(const uuid_vec_t& uuids);
 	bool canAddSelectedToChat(const uuid_vec_t& uuids);
 
 	void onCallButtonClicked();
@@ -202,6 +205,8 @@ private:
 
 	bool mStartConferenceInSameFloater;
 
+	uuid_vec_t mInvitedParticipants;
+
 	// connection to voice channel state change signal
 	boost::signals2::connection mVoiceChannelStateChangeConnection;