Second Life viewer sources 1.17.0.12

1 files changed, 5 insertions, 15 deletions

diff --git a/linden/indra/llmessage/llinstantmessage.h b/linden/indra/llmessage/llinstantmessage.h
index 0b2de19..45db037 100644
--- a/linden/indra/llmessage/llinstantmessage.h
+++ b/linden/indra/llmessage/llinstantmessage.h
@@ -94,13 +94,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,
@@ -112,7 +109,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.
@@ -141,14 +138,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.
@@ -288,6 +277,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(