Second Life viewer sources 1.15.0.2

1 files changed, 11 insertions, 7 deletions

diff --git a/linden/indra/llmessage/llinstantmessage.h b/linden/indra/llmessage/llinstantmessage.h
index a7074a2..0b2de19 100644
--- a/linden/indra/llmessage/llinstantmessage.h
+++ b/linden/indra/llmessage/llinstantmessage.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -93,17 +94,19 @@ enum EInstantMessage
         // communicate with each other.
         //
 
-        // Start a session, or add users to a session.
+        // Add users to a session.
         IM_SESSION_ADD = 13,
 
-        // Start a session, but don't prune offline users
-        IM_SESSION_OFFLINE_ADD = 14,
+        // 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,
 
         // start a session with your gruop
         IM_SESSION_GROUP_START = 15,
 
         // start a session without a calling card (finder or objects)
-        IM_SESSION_CARDLESS_START = 16,
+        IM_SESSION_CONFERENCE_START = 16,
 
         // send a message to a session.
         IM_SESSION_SEND = 17,
@@ -142,9 +145,9 @@ enum EInstantMessage
         // Binary bucket contains the name of the session.
         IM_SESSION_911_START = 29,
 
-        // IM sent automatically on call for help, 
-        // sends a lure to each Helper reached
-        IM_LURE_911 = 30,
+        // 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
@@ -285,6 +288,7 @@ public:
         S32 mTTL;
 };
 
+LLSD im_info_to_llsd(LLPointer<LLIMInfo> im_info);
 
 void pack_instant_message(
         LLMessageSystem* msgsystem,