From f05df68656d2abdc38d86cd6746398fa90eb8614 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 1 Oct 2009 17:44:44 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 * Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816 * Major Bugs: EXT-1142 (timeout during login due to processing group IMs) * Changes: EXT-1216 (minimize message well) --- indra/newview/lltoast.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/lltoast.h') diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index 9248747c43..2166351fd0 100644 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -99,6 +99,9 @@ public: // Operating with toasts // insert a panel to a toast void insertPanel(LLPanel* panel); + + void reshapeToPanel(); + // get toast's panel LLPanel* getPanel() { return mPanel; } // enable/disable Toast's Hide button -- cgit v1.2.3 From 1713a3552b7017cbf781f2effd448f2e8cfb9372 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 1 Oct 2009 17:52:30 +0000 Subject: merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2 * Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160 * Changes: EXT-1139 (places context menu) --- indra/newview/lltoast.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'indra/newview/lltoast.h') diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h index 2166351fd0..29c231a01d 100644 --- a/indra/newview/lltoast.h +++ b/indra/newview/lltoast.h @@ -35,7 +35,7 @@ #include "llpanel.h" -#include "llfloater.h" +#include "llmodaldialog.h" #include "lltimer.h" #include "llnotifications.h" @@ -51,7 +51,7 @@ namespace LLNotificationsUI * Represents toast pop-up. * This is a parent view for all toast panels. */ -class LLToast : public LLFloater +class LLToast : public LLModalDialog { public: typedef boost::function toast_callback_t; @@ -134,8 +134,6 @@ public: void setCanBeStored(bool can_be_stored) { mCanBeStored = can_be_stored; } // bool getCanBeStored() { return mCanBeStored; } - // - void setModal(bool modal); // Registers signals/callbacks for events @@ -171,7 +169,6 @@ private: LLColor4 mBgColor; bool mCanFade; - bool mIsModal; bool mCanBeStored; bool mHideBtnEnabled; bool mHideBtnPressed; -- cgit v1.2.3