diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
| commit | f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 (patch) | |
| tree | db55a74f8d18b3c366608a537e2a32f6d089d56f /indra/llmessage/llinstantmessage.h | |
| parent | 680667d4bdca7e2a6df15cd6f16f34c12c97da8e (diff) | |
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
Diffstat (limited to 'indra/llmessage/llinstantmessage.h')
| -rw-r--r-- | indra/llmessage/llinstantmessage.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/indra/llmessage/llinstantmessage.h b/indra/llmessage/llinstantmessage.h index 99b2734a70..7292ff42de 100644 --- a/indra/llmessage/llinstantmessage.h +++ b/indra/llmessage/llinstantmessage.h @@ -74,13 +74,10 @@ enum EInstantMessage // communicate with each other. // - // Add users to a session. - IM_SESSION_ADD = 13, + // Invite users to a session. + IM_SESSION_INVITE = 13, - // IM sent automatically on call for help, - // sets up a way for each Helper reached to teleport to the - // helpee - IM_SESSION_911_SEND = 14, + IM_SESSION_P2P_INVITE = 14, // start a session with your gruop IM_SESSION_GROUP_START = 15, @@ -92,7 +89,7 @@ enum EInstantMessage IM_SESSION_SEND = 17, // leave a session - IM_SESSION_DROP = 18, + IM_SESSION_LEAVE = 18, // an instant message from an object - for differentiation on the // viewer, since you can't IM an object yet. @@ -121,14 +118,6 @@ enum EInstantMessage // bucket. IM_GOTO_URL = 28, - // IM for help from the GAURDIAN_ANGELS - // Binary bucket contains the name of the session. - IM_SESSION_911_START = 29, - - // IM for requesting to teleport to the creator - // of a livehelp session (assuming they are verified first) - IM_TELEPORT_911 = 30, - // a message generated by a script which we don't want to // be sent through e-mail. Similar to IM_FROM_TASK, but // it is shown as an alert on the viewer. @@ -268,6 +257,7 @@ public: S32 mTTL; }; +LLPointer<LLIMInfo> llsd_to_im_info(const LLSD& im_info_sd); LLSD im_info_to_llsd(LLPointer<LLIMInfo> im_info); void pack_instant_message( |