merge

1 files changed, 8 insertions, 3 deletions

diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h
index 0e1a7f36b7..8b5a266691 100644
--- a/indra/newview/llscriptfloater.h
+++ b/indra/newview/llscriptfloater.h
@@ -43,6 +43,9 @@ class LLToastNotifyPanel;
  */
 class LLScriptFloaterManager : public LLSingleton<LLScriptFloaterManager>
 {
+	// *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);
@@ -102,7 +107,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:
 
@@ -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;