diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-09 15:50:51 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-09 15:50:51 -0600 |
| commit | 8e60cdb3335ec198c71b29d37ab08c4aff9f8223 (patch) | |
| tree | 2e043ee721d725dcc8d654a8f51eaafaaeb423de /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 1d200c56e151eb8fc384693175d1b9318ff0f919 (diff) | |
| parent | 4b20d72a991cfebaf5765fe7756190f4a9645a3b (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 933b40ec79..39c0628cbe 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -1351,7 +1351,6 @@ void LLPanelPrimMediaControls::showNotification(LLNotificationPtr notify) LLWindowShade::Params params; params.rect = mMediaRegion->getLocalRect(); params.follows.flags = FOLLOWS_ALL; - params.notification = notify; //HACK: don't hardcode this if (notify->getIcon() == "Popup_Caution") @@ -1369,7 +1368,7 @@ void LLPanelPrimMediaControls::showNotification(LLNotificationPtr notify) mWindowShade = LLUICtrlFactory::create<LLWindowShade>(params); mMediaRegion->addChild(mWindowShade); - mWindowShade->show(); + mWindowShade->show(notify); } void LLPanelPrimMediaControls::hideNotification() |