iterate iterate.

4 files changed, 14 insertions, 5 deletions

diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 0f7223aaf0..678611a943 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -152,9 +152,9 @@ void LLScriptFloater::createForm(const LLUUID& notification_id)
 
 	// create new form
 	LLRect toast_rect = getRect();
-	if (isScriptTextBox())
+	if (isScriptTextbox())
 	{
-		mScriptForm = new LLToastScriptTextbox(notify, toast_rect);
+		mScriptForm = new LLToastScriptTextbox(notification);
 	}
 	else
 	{
@@ -573,4 +573,11 @@ void LLScriptFloaterManager::setFloaterVisible(const LLUUID& notification_id, bo
 	}
 }
 
+//////////////////////////////////////////////////////////////////
+
+bool  LLScriptFloater::isScriptTextbox()
+{
+	return true;
+}
+
 // EOF
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;
diff --git a/indra/newview/lltoastscripttextbox.cpp b/indra/newview/lltoastscripttextbox.cpp
index b203579362..7fef346ae5 100644
--- a/indra/newview/lltoastscripttextbox.cpp
+++ b/indra/newview/lltoastscripttextbox.cpp
@@ -51,7 +51,7 @@
 const S32 LLToastScriptTextbox::DEFAULT_MESSAGE_MAX_LINE_COUNT	= 7;
 
 LLToastScriptTextbox::LLToastScriptTextbox(LLNotificationPtr& notification)
-:	LLToastPanel(notification),
+:	LLToastNotifyPanel(notification),
 	mInventoryOffer(NULL)
 {
 	buildFromFile( "panel_notify_textbox.xml");
diff --git a/indra/newview/lltoastscripttextbox.h b/indra/newview/lltoastscripttextbox.h
index 2d942939bc..86fe93cf66 100644
--- a/indra/newview/lltoastscripttextbox.h
+++ b/indra/newview/lltoastscripttextbox.h
@@ -28,7 +28,7 @@
 #define LL_LLTOASTSCRIPTTEXTBOX_H
 
 #include "llfontgl.h"
-#include "lltoastpanel.h"
+#include "lltoastnotifypanel.h"
 #include "lldarray.h"
 #include "lltimer.h"
 #include "llviewermessage.h"
@@ -42,7 +42,7 @@ class LLButton;
  * Replaces class LLGroupNotifyBox.
  */
 class LLToastScriptTextbox
-:	public LLToastPanel
+:	public LLToastNotifyPanel
 {
 public:
 	void close();