diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-12 17:13:55 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-12 17:13:55 -0500 |
| commit | 2cabf100e22d4f54ebd0ea6ea20b88985a5654c4 (patch) | |
| tree | a410a41598caf63aeef39b2d0c40741ac372c10f /indra/newview/llnotificationalerthandler.cpp | |
| parent | dce57c6b80b1286889da1a6cadda05c864a31851 (diff) | |
| parent | 21be0916a4b707654e99a8c6c734d24e4bb5da7c (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llnotificationalerthandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationalerthandler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp index 52de8355e9..60e41b64ac 100644 --- a/indra/newview/llnotificationalerthandler.cpp +++ b/indra/newview/llnotificationalerthandler.cpp @@ -36,6 +36,7 @@ #include "llnotificationhandler.h" #include "llnotifications.h" +#include "llprogressview.h" #include "lltoastnotifypanel.h" #include "llviewercontrol.h" #include "llviewerwindow.h" @@ -116,6 +117,11 @@ bool LLAlertHandler::processNotification(const LLSD& notify) p.is_modal = mIsModal; p.on_delete_toast = boost::bind(&LLAlertHandler::onDeleteToast, this, _1); + // Show alert in middle of progress view (during teleport) (EXT-1093) + LLProgressView* progress = gViewerWindow->getProgressView(); + LLRect rc = progress && progress->getVisible() ? progress->getRect() : gViewerWindow->getWorldViewRectScaled(); + mChannel->updatePositionAndSize(rc, rc); + LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel); if(channel) channel->addToast(p); |