diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 08:04:26 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 08:04:26 +0000 |
| commit | 9e2cb2f4a00a6acc48738f9df788ad5adfc7d62a (patch) | |
| tree | 1a8d50ed5791e6c5fe3239e88c41ce5d6b561e68 /indra/llui/llmodaldialog.cpp | |
| parent | 745845f79987e4b4ab7f5728746a0eda8898930f (diff) | |
DEV-38942 Eliminate startModal() from LLModalDialog
Also moved TOS and Critical floaters to login debug menu for testing
Diffstat (limited to 'indra/llui/llmodaldialog.cpp')
| -rw-r--r-- | indra/llui/llmodaldialog.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp index c8162fe466..f77ec5f4c7 100644 --- a/indra/llui/llmodaldialog.cpp +++ b/indra/llui/llmodaldialog.cpp @@ -44,11 +44,10 @@ // static std::list<LLModalDialog*> LLModalDialog::sModalStack; -LLModalDialog::LLModalDialog( const LLSD& key, S32 width, S32 height, BOOL modal ) +LLModalDialog::LLModalDialog( const LLSD& key, BOOL modal ) : LLFloater(key), mModal( modal ) { - setRect(LLRect( 0, height, width, 0 )); if (modal) { setCanMinimize(FALSE); @@ -98,7 +97,8 @@ void LLModalDialog::reshape(S32 width, S32 height, BOOL called_from_parent) centerOnScreen(); } -void LLModalDialog::startModal() +// virtual +void LLModalDialog::onOpen(const LLSD& key) { if (mModal) { @@ -116,8 +116,6 @@ void LLModalDialog::startModal() sModalStack.push_front( this ); } - - setVisible( TRUE ); } void LLModalDialog::stopModal() |