diff options
| -rw-r--r-- | indra/newview/lltoastscripttextbox.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_notify_textbox.xml | 58 |
2 files changed, 8 insertions, 59 deletions
diff --git a/indra/newview/lltoastscripttextbox.cpp b/indra/newview/lltoastscripttextbox.cpp index 391aee79e8..a9f8272ea9 100644 --- a/indra/newview/lltoastscripttextbox.cpp +++ b/indra/newview/lltoastscripttextbox.cpp @@ -151,12 +151,13 @@ void LLToastScriptTextbox::close() // The group notice dialog may be an inventory offer. // If it has an inventory save button and that button is still enabled // Then we need to send the inventory declined message + /* if(mInventoryOffer != NULL) { mInventoryOffer->forceResponse(IOR_DECLINE); mInventoryOffer = NULL; } - + */ die(); } @@ -166,8 +167,9 @@ void LLToastScriptTextbox::onClickOk() response["OH MY GOD WHAT A HACK"] = true; mNotification->respond(response); close(); + //llerrs << response << llendl; } - +/* void LLToastScriptTextbox::onClickAttachment() { if (mInventoryOffer != NULL) { @@ -190,7 +192,9 @@ void LLToastScriptTextbox::onClickAttachment() mInventoryOffer = NULL; } } +*/ + /* //static bool LLToastScriptTextbox::isAttachmentOpenable(LLAssetType::EType type) { @@ -208,3 +212,4 @@ bool LLToastScriptTextbox::isAttachmentOpenable(LLAssetType::EType type) } } + */ diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml index 6a07d41e7e..dcd1e29e17 100644 --- a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml +++ b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml @@ -12,43 +12,8 @@ name="message_max_lines_count" value="7" /> <string - name="subject_font" - value="SANSSERIF_BIG" /> - <string name="date_font" value="SANSSERIF" /> - <panel - background_visible="true" - follows="top" - height="30" - label="header" - layout="topleft" - left="0" - name="header" - top="0" - width="305"> - <icon - follows="all" - height="20" - layout="topleft" - left="5" - mouse_opaque="true" - name="group_icon" - top="5" - width="20" /> - <text - follows="all" - font="SansSerifBig" - height="20" - layout="topleft" - left_pad="10" - name="title" - text_color="GroupNotifyTextColor" - top="5" - use_ellipses="true" - value="Sender Name / Group Name" - width="230" /> - </panel> <text_editor parse_urls="true" enabled="true" @@ -65,29 +30,8 @@ use_ellipses="true" value="message" width="270" - word_wrap="true" > + word_wrap="true" > </text_editor> - <icon - bottom="60" - follows="left|bottom|right" - height="15" - layout="topleft" - left="25" - mouse_opaque="true" - name="attachment_icon" - width="15" /> - <text - bottom="60" - follows="left|bottom|right" - font="SansSerif" - height="15" - layout="topleft" - left="45" - name="attachment" - text_color="GroupNotifyTextColor" - value="Attachment" - use_ellipses="true" - width="250" /> <button bottom="85" follows="bottom" |