automated merge PE->viewer2.0

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index cec9d1642f..11860d0efb 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -501,6 +501,17 @@ protected:
 	virtual void onLifetimeExpired() {};
 
 	virtual void getAllowedRect(LLRect& rect);
+
+	/**
+	 * Sets icon depend on session.
+	 *
+	 * If passed session_id is a group id group icon will be shown, otherwise avatar icon for participant_id
+	 *
+	 * @param session_id - UUID of session
+	 * @param participant_id - UUID of other participant
+	 */
+	void setIcon(const LLSD& session_id, const LLSD& participant_id);
+
 	LLSD mPayload;
 };