From 862ca3fa1628b0cef2e3db22f6c917a85492216f Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 19 Jan 2010 12:42:33 +0200
Subject: Fixed major bug EXT-4206 - Bottom bar spec calls for button
 background art on IM Chiclets.

--HG--
branch : product-engine
---
 indra/newview/llchiclet.h | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llchiclet.h')

diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 3665e4d093..ae5b2148db 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -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;
-- 
cgit v1.2.3


From bde7830bf531245570d5754e71f5724ead72dfc1 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Tue, 19 Jan 2010 17:58:17 +0200
Subject: =?UTF-8?q?fixed=20EXT-4478=20=E2=80=9CMemory=20leak=20in=20LLChic?=
 =?UTF-8?q?letPanel=E2=80=9D,=20added=20destroying=20chiclet=20on=20chicle?=
 =?UTF-8?q?t=20panel=20item=20remove=20event;=20made=20LLIMChiclet=20destr?=
 =?UTF-8?q?uctor=20virtual;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/llchiclet.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llchiclet.h')

diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index ae5b2148db..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.
-- 
cgit v1.2.3