Merge with SVN viewer-2.0.0-3 branch

1 files changed, 19 insertions, 1 deletions

diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index f96dfb69ec..91f55915ed 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -272,6 +272,11 @@ private:
 class LLIMChiclet : public LLChiclet
 {
 public:
+	enum EType {
+		TYPE_UNKNOWN,
+		TYPE_IM,
+		TYPE_GROUP
+	};
 	
 	/*virtual*/ ~LLIMChiclet() {};
 
@@ -307,6 +312,19 @@ public:
 	/*virtual*/ void draw();
 
 	/**
+	 * Determine whether given ID refers to a group or an IM chat session.
+	 * 
+	 * This is used when we need to chose what IM chiclet (P2P/group)
+	 * class to instantiate.
+	 * 
+	 * @param session_id session ID.
+	 * @return TYPE_GROUP in case of group chat session,
+	 *         TYPE_IM in case of P2P session,
+	 *         TYPE_UNKNOWN otherwise.
+	 */
+	static EType getIMSessionType(const LLUUID& session_id);
+
+	/**
 	 * The action taken on mouse down event.
 	 * 
 	 * Made public so that it can be triggered from outside
@@ -368,7 +386,7 @@ public:
 		Params();
 	};
 
-	void setOtherParticipantId(const LLUUID& other_participant_id);
+	/* virtual */ void setOtherParticipantId(const LLUUID& other_participant_id);
 
 	/*virtual*/ void setShowSpeaker(bool show);