summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.h
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2012-08-10 02:51:56 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2012-08-10 02:51:56 +0300
commitf744fe8b5496e8d2d357ce88b3552eeee2125a5e (patch)
treed410b2ef2c6aa4390f1d82cc46567a47d4ff9b5c /indra/newview/llimfloater.h
parent324200dfd7d70324fe15329100140d98bb1f9b17 (diff)
CHUI-120 WIP Different notifications about single and multiple chat participants invited.
The notification about starting a new conversation now applies only to P2P chat. Some code refactoring and clean up.
Diffstat (limited to 'indra/newview/llimfloater.h')
-rw-r--r--indra/newview/llimfloater.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h
index d98213b54c..4e09a24a09 100644
--- a/indra/newview/llimfloater.h
+++ b/indra/newview/llimfloater.h
@@ -89,7 +89,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
@@ -160,8 +161,9 @@ private:
static void onInputEditorKeystroke(LLTextEditor* caller, void* userdata);
void setTyping(bool typing);
void onAddButtonClicked();
- void onAddSessionParticipants(const uuid_vec_t& uuids);
- void addSessionParticipants(const LLSD& notification, const LLSD& response);
+ void addSessionParticipants(const uuid_vec_t& uuids);
+ void addP2PSessionParticipants(const uuid_vec_t& uuids);
+ void sendParticipantsAddedNotification(const uuid_vec_t& uuids);
bool canAddSelectedToChat(const uuid_vec_t& uuids);
void onCallButtonClicked();