From 17d913fef4778234c97b48d26167d6e1f62d8add Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 13 Sep 2010 13:56:29 +0100
Subject: VWR-20756 WIP - very limping display of llTextBox

---
 indra/newview/lltoastnotifypanel.cpp               | 19 +++++++++++++++++--
 .../skins/default/xui/en/panel_notification.xml    | 22 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index 9febcb3d8b..6413874863 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -148,6 +148,11 @@ mCloseNotificationOnDestroy(true)
 	mTextBox->setVisible(TRUE);
 	mTextBox->setValue(notification->getMessage());
 
+	mUserInputBox = getChild<LLTextEditor>("user_input_box"); 
+	mUserInputBox->setMaxTextLength(254);// FIXME
+	mUserInputBox->setVisible(FALSE);
+	mUserInputBox->setEnabled(FALSE);
+
 	// add buttons for a script notification
 	if (mIsTip)
 	{
@@ -164,6 +169,16 @@ mCloseNotificationOnDestroy(true)
 			LLSD form_element = form->getElement(i);
 			if (form_element["type"].asString() != "button")
 			{
+				// not a button.
+				continue;
+			}
+			if (form_element["name"].asString() == TEXTBOX_MAGIC_TOKEN)
+			{
+				// a textbox pretending to be a button.
+				// (re)enable the textbox for this panel, and continue.
+				mUserInputBox->setVisible(TRUE);
+				mUserInputBox->setEnabled(TRUE);
+				mUserInputBox->insertText("FOOOOOO!!!!");
 				continue;
 			}
 			LLButton* new_button = createButton(form_element, TRUE);
@@ -278,7 +293,7 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt
 		p.image_color(LLUIColorTable::instance().getColor("ButtonCautionImageColor"));
 		p.image_color_disabled(LLUIColorTable::instance().getColor("ButtonCautionImageColor"));
 	}
-	// for the scriptdialog buttons we use fixed button size. This  is a limit!
+	// for the scriptdialog buttons we use fixed button size. This is a limit!
 	if (!mIsScriptDialog && font->getWidth(form_element["text"].asString()) > BUTTON_WIDTH)
 	{
 		p.rect.width = 1;
@@ -286,7 +301,7 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt
 	}
 	else if (mIsScriptDialog && is_ignore_btn)
 	{
-		// this is ignore button,make it smaller
+		// this is ignore button, make it smaller
 		p.rect.height = BTN_HEIGHT_SMALL;
 		p.rect.width = 1;
 		p.auto_resize = true;
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 59ead84127..a816eaccb6 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -55,6 +55,28 @@
       visible="false"
       width="285"
       wrap="true"/>
+    <text_editor
+    	h_pad="0"
+	v_pad="0"
+      border_visible="true"
+      embedded_items="false"
+      enabled="false"
+      follows="left|right|top|bottom"
+      font="SansSerif"
+      height="85" 
+      layout="topleft"
+      left="10"
+      mouse_opaque="false"
+      name="user_input_box"
+      read_only="false"
+      tab_stop="false"
+      text_color="red"
+      top="50"
+      visible="false"
+      width="285"
+      wrap="true"
+      parse_highlights="true"
+      parse_urls="true"/>
     <text_editor
     	h_pad="0"
 	v_pad="0"
-- 
cgit v1.2.3