From b6a498c3018976b97c2353be066502e4a298e156 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 28 Sep 2010 13:41:46 +0100
Subject: iterate iterate.

---
 indra/newview/llscriptfloater.h | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h
index da70bb4334..fec81704d8 100644
--- a/indra/newview/llscriptfloater.h
+++ b/indra/newview/llscriptfloater.h
@@ -203,6 +203,8 @@ protected:
 	void dockToChiclet(bool dock);
 
 private:
+	bool isScriptTextbox();
+
 	LLToastNotifyPanel* mScriptForm;
 	LLUUID mNotificationId;
 	LLUUID mObjectId;
-- 
cgit v1.2.3


From d2474edf85674aa4fb150caee184fc434915d5e6 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 28 Sep 2010 17:47:24 +0100
Subject: restore switching logic between textbox/nontextbox, after the
 refactor.

---
 indra/newview/llscriptfloater.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h
index fec81704d8..dc52baa115 100644
--- a/indra/newview/llscriptfloater.h
+++ b/indra/newview/llscriptfloater.h
@@ -28,6 +28,7 @@
 #define LL_SCRIPTFLOATER_H
 
 #include "lltransientdockablefloater.h"
+#include "llnotificationptr.h"
 
 class LLToastNotifyPanel;
 
@@ -203,7 +204,7 @@ protected:
 	void dockToChiclet(bool dock);
 
 private:
-	bool isScriptTextbox();
+	bool isScriptTextbox(LLNotificationPtr notification);
 
 	LLToastNotifyPanel* mScriptForm;
 	LLUUID mNotificationId;
-- 
cgit v1.2.3


From 29dc24a3ea8d6f3d3aa83fd6b22921937d0dd430 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 14 Dec 2010 14:53:51 +0200
Subject: STORM-713 FIXED XML/UI issues in llTextBox

- As the class LLToastNotifyPanel is deprecated, made the class LLToastScriptTextbox derived directly from LLToastPanel.

- Added callback for ignore button.

Now LLToastScriptTextbox has its own XML, therefore it's not needed to dynamically create toast panel.

Since LLToastNotifyPanel is deprecated all new notification toasts should be created this way.
---
 indra/newview/llscriptfloater.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llscriptfloater.h b/indra/newview/llscriptfloater.h
index dc52baa115..8e959a3d0e 100644
--- a/indra/newview/llscriptfloater.h
+++ b/indra/newview/llscriptfloater.h
@@ -30,7 +30,7 @@
 #include "lltransientdockablefloater.h"
 #include "llnotificationptr.h"
 
-class LLToastNotifyPanel;
+class LLToastPanel;
 
 /**
  * Handles script notifications ("ScriptDialog" and "ScriptDialogGroup")
@@ -206,7 +206,7 @@ protected:
 private:
 	bool isScriptTextbox(LLNotificationPtr notification);
 
-	LLToastNotifyPanel* mScriptForm;
+	LLToastPanel* mScriptForm;
 	LLUUID mNotificationId;
 	LLUUID mObjectId;
 	bool mSaveFloaterPosition;
-- 
cgit v1.2.3