diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-18 18:09:28 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-18 18:09:28 -0700 |
| commit | cb1c85261e768c9653ed40bf6160e7cc7ca9ce74 (patch) | |
| tree | a5cccd2fca9fefe4717168f108bcb8d18fe98cf5 /indra/newview/lltoast.cpp | |
| parent | c2e88db89a8ba111efd0c1b61cc8dec400a007cb (diff) | |
| parent | 6c0fbdafaed93b90354b37513a3b61dee56fb8b2 (diff) | |
Pull in viewer-development
Diffstat (limited to 'indra/newview/lltoast.cpp')
| -rw-r--r-- | indra/newview/lltoast.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index fd5582d6f7..e0b07ed408 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -99,7 +99,6 @@ LLToast::Params::Params() LLToast::LLToast(const LLToast::Params& p) : LLModalDialog(LLSD(), p.is_modal), - mPanel(p.panel), mToastLifetime(p.lifetime_secs), mToastFadingTime(p.fading_time_secs), mNotificationID(p.notif_id), @@ -108,6 +107,7 @@ LLToast::LLToast(const LLToast::Params& p) mCanBeStored(p.can_be_stored), mHideBtnEnabled(p.enable_hide_btn), mHideBtn(NULL), + mPanel(NULL), mNotification(p.notification), mIsHidden(false), mHideBtnPressed(false), @@ -128,9 +128,9 @@ LLToast::LLToast(const LLToast::Params& p) setBackgroundOpaque(TRUE); // *TODO: obsolete updateTransparency(); - if(mPanel) + if(p.panel()) { - insertPanel(mPanel); + insertPanel(p.panel); } if(mHideBtnEnabled) @@ -309,6 +309,7 @@ void LLToast::reshapeToPanel() void LLToast::insertPanel(LLPanel* panel) { + mPanel = panel; mWrapperPanel->addChild(panel); reshapeToPanel(); } |