PE merge.

1 files changed, 19 insertions, 2 deletions

diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 3665e4d093..bb4846aa57 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -325,7 +325,7 @@ public:
 	};
 
 	
-	/*virtual*/ ~LLIMChiclet() {};
+	virtual ~LLIMChiclet() {};
 
 	/**
 	 * Sets IM session name. This name will be displayed in chiclet tooltip.
@@ -422,6 +422,8 @@ public:
 	 */
 	virtual void onMouseDown();
 
+	virtual void setToggleState(bool toggle);
+
 protected:
 
 	LLIMChiclet(const LLIMChiclet::Params& p);
@@ -438,7 +440,7 @@ protected:
 	LLIconCtrl* mNewMessagesIcon;
 	LLChicletNotificationCounterCtrl* mCounterCtrl;
 	LLChicletSpeakerCtrl* mSpeakerCtrl;
-
+	LLButton* mChicletButton;
 
 	/** the id of another participant, either an avatar id or a group id*/
 	LLUUID mOtherParticipantId;
@@ -473,6 +475,8 @@ class LLIMP2PChiclet : public LLIMChiclet
 public:
 	struct Params : public LLInitParam::Block<Params, LLIMChiclet::Params>
 	{
+		Optional<LLButton::Params> chiclet_button;
+
 		Optional<LLChicletAvatarIconCtrl::Params> avatar_icon;
 
 		Optional<LLChicletNotificationCounterCtrl::Params> unread_notifications;
@@ -538,6 +542,8 @@ class LLAdHocChiclet : public LLIMChiclet
 public:
 	struct Params : public LLInitParam::Block<Params, LLIMChiclet::Params>
 	{
+		Optional<LLButton::Params> chiclet_button;
+
 		Optional<LLChicletAvatarIconCtrl::Params> avatar_icon;
 
 		Optional<LLChicletNotificationCounterCtrl::Params> unread_notifications;
@@ -614,6 +620,8 @@ public:
 
 	struct Params : public LLInitParam::Block<Params, LLIMChiclet::Params>
 	{
+		Optional<LLButton::Params> chiclet_button;
+
 		Optional<LLIconCtrl::Params> icon;
 
 		Optional<LLIconCtrl::Params> new_message_icon;
@@ -656,6 +664,8 @@ public:
 
 	struct Params : public LLInitParam::Block<Params, LLIMChiclet::Params>
 	{
+		Optional<LLButton::Params> chiclet_button;
+
 		Optional<LLChicletInvOfferIconCtrl::Params> icon;
 
 		Optional<LLIconCtrl::Params> new_message_icon;
@@ -697,6 +707,8 @@ public:
 
 	struct Params : public LLInitParam::Block<Params, LLIMChiclet::Params>
 	{
+		Optional<LLButton::Params> chiclet_button;
+
 		Optional<LLChicletGroupIconCtrl::Params> group_icon;
 
 		Optional<LLChicletNotificationCounterCtrl::Params> unread_notifications;
@@ -1040,6 +1052,11 @@ public:
 
 	S32	notifyParent(const LLSD& info);
 
+	/**
+	 * Toggle chiclet by session id ON and toggle OFF all other chiclets.
+	 */
+	void setChicletToggleState(const LLUUID& session_id, bool toggle);
+
 protected:
 	LLChicletPanel(const Params&p);
 	friend class LLUICtrlFactory;