From 32887cdc5407c7ced2d030cc8423fb0ab688170f Mon Sep 17 00:00:00 2001
From: Sergey Borushevsky <sborushevsky@productengine.com>
Date: Tue, 1 Dec 2009 17:13:35 +0200
Subject: Implemented normal task EXT-2750 (Add context menu for group and
 ad-hoc chiclet) Added menu to ad-hoc chiclet, which contains one 'End
 Session' item.

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

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

diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 1ea141e6c4..ed4bcbc6ac 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -517,6 +517,17 @@ protected:
 	LLAdHocChiclet(const Params& p);
 	friend class LLUICtrlFactory;
 
+	/**
+	 * Creates chiclet popup menu. Will create AdHoc Chat menu 
+	 * based on other participant's id.
+	 */
+	virtual void createPopupMenu();
+
+	/**
+	 * Processes clicks on chiclet popup menu.
+	 */
+	virtual void onMenuItemClicked(const LLSD& user_data);
+
 	/**
 	 * Displays popup menu.
 	 */
-- 
cgit v1.2.3


From 06d5706cdcc690c713dcd832a878e830afbb4a59 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Tue, 1 Dec 2009 22:30:04 +0200
Subject: Implemented normal sub-task EXT-2478(Implement a chiclet for the
 llGiveInventory() processing)

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

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

diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index ed4bcbc6ac..c75ad2b546 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -147,6 +147,39 @@ protected:
 	std::string mDefaultIcon;
 };
 
+/**
+ * Class for displaying icon in inventory offer chiclet.
+ */
+class LLChicletInvOfferIconCtrl : public LLChicletAvatarIconCtrl
+{
+public:
+
+	struct Params :
+		public LLInitParam::Block<Params, LLChicletAvatarIconCtrl::Params>
+	{
+		Optional<std::string> default_icon;
+
+		Params()
+		 : default_icon("default_icon", "Generic_Object_Small")
+		{
+			avatar_id = LLUUID::null;
+		};
+	};
+
+	/**
+	 * Sets icon, if value is LLUUID::null - default icon will be set.
+	 */
+	virtual void setValue(const LLSD& value );
+
+protected:
+
+	LLChicletInvOfferIconCtrl(const Params& p);
+	friend class LLUICtrlFactory;
+
+private:
+	std::string mDefaultIcon;
+};
+
 /**
  * Class for displaying of speaker's voice indicator 
  */
@@ -584,6 +617,45 @@ private:
 	LLIconCtrl* mChicletIconCtrl;
 };
 
+/**
+ * Chiclet for inventory offer script floaters.
+ */
+class LLInvOfferChiclet: public LLIMChiclet
+{
+public:
+
+	struct Params : public LLInitParam::Block<Params, LLIMChiclet::Params>
+	{
+		Optional<LLChicletInvOfferIconCtrl::Params> icon;
+
+		Params();
+	};
+
+	/*virtual*/ void setSessionId(const LLUUID& session_id);
+
+	/*virtual*/ void setCounter(S32 counter){}
+
+	/*virtual*/ S32 getCounter() { return 0; }
+
+	/**
+	 * Toggle script floater
+	 */
+	/*virtual*/ void onMouseDown();
+
+	/**
+	 * Override default handler
+	 */
+	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+
+
+protected:
+	LLInvOfferChiclet(const Params&);
+	friend class LLUICtrlFactory;
+
+private:
+	LLChicletInvOfferIconCtrl* mChicletIconCtrl;
+};
+
 /**
  * Implements Group chat chiclet.
  */
-- 
cgit v1.2.3