diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:22:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:22:43 -0400 |
| commit | fb1facf13a2f7413b42802bd7293d504eb4e4174 (patch) | |
| tree | 9f0e5b980fa2d2e2d4bf97902610456fa279d6cd /indra/newview/lltoast.cpp | |
| parent | a4f2c570dd42066f0e2738a0fd2de6c61c35b47b (diff) | |
| parent | 1c375a8c880354432da2b218c321ed708497e161 (diff) | |
syncing up to 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(); } |