From 13a6077b780117be0fa3a054426d139ca1d35df9 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 20 Nov 2009 19:17:38 +0200
Subject: Implemented normal task EXT-2081 - Object IM chiclets art needs to be
 hooked up to LLDialog chiclets. Implemented LLDialog(LLScriptFloater) and
 Script Chiclets.

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

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

diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index bb5dc1e550..a46f817c13 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -533,6 +533,40 @@ private:
 	LLMenuGL* mPopupMenu;
 };
 
+class LLScriptChiclet : public LLIMChiclet
+{
+public:
+
+	struct Params : public LLInitParam::Block<Params, LLIMChiclet::Params>
+	{
+		Optional<LLChicletAvatarIconCtrl::Params> avatar_icon;
+
+		Params();
+	};
+
+	void setSessionId(const LLUUID& session_id);
+
+	void setCounter(S32 counter){}
+
+	S32 getCounter() { return 0; }
+
+	void onMouseDown();
+
+	BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+
+	void draw();
+
+protected:
+
+	LLScriptChiclet(const Params&);
+	friend class LLUICtrlFactory;
+
+private:
+
+	LLPointer<LLUIImage> mImage;
+	LLChicletAvatarIconCtrl* mChicletIconCtrl;
+};
+
 /**
  * Implements Group chat chiclet.
  */
-- 
cgit v1.2.3


From 9f0dbcf4c0c6c8621c377fd7f9e417aa76acd836 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Mon, 23 Nov 2009 15:50:49 +0200
Subject: Update for task EXT-2081 - Object IM chiclets art needs to be hooked
 up to LLDialog chiclets. Cleaned code, added comments.

--HG--
branch : product-engine
---
 indra/newview/llchiclet.h | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 56f164738e..1ea141e6c4 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -533,28 +533,35 @@ private:
 	LLMenuGL* mPopupMenu;
 };
 
+/**
+ * Chiclet for script floaters.
+ */
 class LLScriptChiclet : public LLIMChiclet
 {
 public:
 
 	struct Params : public LLInitParam::Block<Params, LLIMChiclet::Params>
 	{
-		Optional<LLChicletAvatarIconCtrl::Params> avatar_icon;
+		Optional<LLIconCtrl::Params> icon;
 
 		Params();
 	};
 
-	void setSessionId(const LLUUID& session_id);
-
-	void setCounter(S32 counter){}
+	/*virtual*/ void setSessionId(const LLUUID& session_id);
 
-	S32 getCounter() { return 0; }
+	/*virtual*/ void setCounter(S32 counter){}
 
-	void onMouseDown();
+	/*virtual*/ S32 getCounter() { return 0; }
 
-	BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+	/**
+	 * Toggle script floater
+	 */
+	/*virtual*/ void onMouseDown();
 
-	void draw();
+	/**
+	 * Override default handler
+	 */
+	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
 
 protected:
 
@@ -563,8 +570,7 @@ protected:
 
 private:
 
-	LLPointer<LLUIImage> mImage;
-	LLChicletAvatarIconCtrl* mChicletIconCtrl;
+	LLIconCtrl* mChicletIconCtrl;
 };
 
 /**
-- 
cgit v1.2.3