diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 16:07:14 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 16:07:14 +0000 |
| commit | 739e3545b32bfa9e15beed0e2ecc44297d9f0950 (patch) | |
| tree | a206e0d65efe16fbab9df033ecb635ab16a8a427 /indra/newview/llscreenchannel.cpp | |
| parent | 9a15ee8a91a12020b22625873c280837739f946c (diff) | |
| parent | c99fb12b3d300705dbf6eb68b1a3f22927d4d221 (diff) | |
PE merge.
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()) |