From 963c2240f4584f16b5e003b506c8c608331d8585 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Wed, 2 Dec 2009 16:53:13 +0200 Subject: Update for normal task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets. Disabled notification toast. --HG-- branch : product-engine --- indra/newview/llscriptfloater.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llscriptfloater.h') diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h index 0e1a7f36b7..944b0ba0a2 100644 --- a/indra/newview/llscriptfloater.h +++ b/indra/newview/llscriptfloater.h @@ -102,7 +102,7 @@ private: * LLScriptFloater will create script form based on notification data and * will auto fit the form. */ -class LLScriptFloater : public LLTransientDockableFloater +class LLScriptFloater : public LLDockableFloater { public: -- cgit v1.2.3 From 7dce1bad0c4e7d3f9cebd11173146fc775f687f3 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Thu, 3 Dec 2009 17:55:17 +0200 Subject: Fixed normal bug EXT-3021 - Viewer crashes on receiving notification for creating script(offer) chiclet for same object in second time. --HG-- branch : product-engine --- indra/newview/llscriptfloater.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/newview/llscriptfloater.h') diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h index 944b0ba0a2..8b5a266691 100644 --- a/indra/newview/llscriptfloater.h +++ b/indra/newview/llscriptfloater.h @@ -43,6 +43,9 @@ class LLToastNotifyPanel; */ class LLScriptFloaterManager : public LLSingleton { + // *TODO + // LLScriptFloaterManager and LLScriptFloater will need some refactoring after we + // know how script notifications should look like. public: /** @@ -69,6 +72,8 @@ public: */ void toggleScriptFloater(const LLUUID& object_id); + LLUUID findObjectId(const LLUUID& notification_id); + LLUUID findNotificationId(const LLUUID& object_id); LLUUID findNotificationToastId(const LLUUID& object_id); @@ -125,6 +130,8 @@ public: const LLUUID& getObjectId() { return mObjectId; } + void setObjectId(const LLUUID& id) { mObjectId = id; } + /** * Close notification if script floater is closed. */ @@ -154,8 +161,6 @@ protected: */ static void hideToastsIfNeeded(); - void setObjectId(const LLUUID& id) { mObjectId = id; } - private: LLToastNotifyPanel* mScriptForm; LLUUID mObjectId; -- cgit v1.2.3