diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-04 17:12:36 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-04 17:12:36 +0200 |
| commit | 29a5e29ddb72ae141345753db269d3f2dbfd195c (patch) | |
| tree | 347dc7d19999ab3afbb1941d0c6d8a059e312351 /indra/newview/llscreenchannel.cpp | |
| parent | 41c6155f13dbb9ed8bc136bc3350bc8fc87e7f56 (diff) | |
| parent | e918089f592da2094e6b23a146e0e30b711562dc (diff) | |
merge
--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 8f36c0e88a..7c2e7e3319 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -533,9 +533,13 @@ void LLScreenChannel::showToastsBottom() // HACK // EXT-2653: it is necessary to prevent overlapping for secondary showed toasts (*it).toast->setVisible(TRUE); - // Show toast behind floaters. (EXT-3089) - gFloaterView->sendChildToBack((*it).toast); } + if(!(*it).toast->hasFocus()) + { + // Fixing Z-order of toasts (EXT-4862) + // Next toast will be positioned under this one. + gFloaterView->sendChildToBack((*it).toast); + } } if(it != mToastList.rend()) |