diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-12-15 10:54:37 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-12-15 10:54:37 +0200 |
| commit | c157c1176a570ab61978063dcc8d0ce3fe31483d (patch) | |
| tree | 87c3ee2fcca46a42a5be2118b026028d64965d68 /indra/newview/llscreenchannel.cpp | |
| parent | 02e5d2fd83a26d6d5e1d9639947a084bd8229b06 (diff) | |
Update for normal task EXT-3089 - Notification toasts positioning, layering and stacking.
Docked LLDialogs are part of toasts positioning rules.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llscreenchannel.cpp')
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 78cc7c54dc..bd256ec9c2 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -815,14 +815,18 @@ void LLScreenChannel::updateShowToastsState() } // for Message Well floater showed in a docked state - adjust channel's height - if(dynamic_cast<LLSysWellWindow*>(floater) || dynamic_cast<LLIMFloater*>(floater)) + if(dynamic_cast<LLSysWellWindow*>(floater) || dynamic_cast<LLIMFloater*>(floater) + || dynamic_cast<LLScriptFloater*>(floater)) { S32 channel_bottom = gViewerWindow->getWorldViewRectScaled().mBottom + gSavedSettings.getS32("ChannelBottomPanelMargin");; LLRect this_rect = getRect(); if(floater->getVisible() && floater->isDocked()) { channel_bottom += floater->getRect().getHeight(); - channel_bottom += floater->getDockControl()->getTongueHeight(); + if(floater->getDockControl()) + { + channel_bottom += floater->getDockControl()->getTongueHeight(); + } } if(channel_bottom != this_rect.mBottom) |