diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-12 12:05:51 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-12 12:05:51 -0800 |
| commit | 426aca61d3c00d57d7066fb1ca5a7be8d138542e (patch) | |
| tree | 8ab65d462f97bbd3ab5104c8b4d3ea497866e77a /indra/newview/llnotificationalerthandler.cpp | |
| parent | c61cb61ecc6beca1560a93cdad4ed1bc055c57f9 (diff) | |
| parent | 01d462482189abe18a52c293315ab536287b599a (diff) | |
Merge
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); |