svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release

1 files changed, 10 insertions, 7 deletions

diff --git a/indra/llmessage/llinstantmessage.h b/indra/llmessage/llinstantmessage.h
index c8138cf491..99b2734a70 100644
--- a/indra/llmessage/llinstantmessage.h
+++ b/indra/llmessage/llinstantmessage.h
@@ -74,17 +74,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,
@@ -123,9 +125,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
@@ -266,6 +268,7 @@ public:
 	S32 mTTL;
 };
 
+LLSD im_info_to_llsd(LLPointer<LLIMInfo> im_info);
 
 void pack_instant_message(
 	LLMessageSystem* msgsystem,