summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychathandler.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-04 16:07:14 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-04 16:07:14 +0000
commit739e3545b32bfa9e15beed0e2ecc44297d9f0950 (patch)
treea206e0d65efe16fbab9df033ecb635ab16a8a427 /indra/newview/llnearbychathandler.cpp
parent9a15ee8a91a12020b22625873c280837739f946c (diff)
parentc99fb12b3d300705dbf6eb68b1a3f22927d4d221 (diff)
PE merge.
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
-rw-r--r--indra/newview/llnearbychathandler.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index c08ca30bab..be48770567 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -274,6 +274,13 @@ void LLNearbyChatScreenChannel::showToastsBottom()
toast->setRect(toast_rect);
toast->setIsHidden(false);
toast->setVisible(TRUE);
+
+ if(!toast->hasFocus())
+ {
+ // Fixing Z-order of toasts (EXT-4862)
+ // Next toast will be positioned under this one.
+ gFloaterView->sendChildToBack(toast);
+ }
bottom = toast->getRect().mTop;
}