summaryrefslogtreecommitdiff
path: root/indra/newview/lltoast.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-02 07:52:41 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-02 07:52:41 +0100
commit9354571174af49849b56b5cc2a81c8d65f59cdfe (patch)
treeb58806fc9fad9c38a48d6d9d042bad0cbf308f80 /indra/newview/lltoast.cpp
parent605a4a459e23073814e8ce18c8e9997a9e01fab0 (diff)
parent813d4cc8a336e0ef66d0f368269f5c10d9817c59 (diff)
merge.
Diffstat (limited to 'indra/newview/lltoast.cpp')
-rw-r--r--indra/newview/lltoast.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 568cd4cb19..9abfab300c 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -271,7 +271,10 @@ void LLToast::setVisible(BOOL show)
{
mTimer->start();
}
- LLModalDialog::setFrontmost(FALSE);
+ if (!getVisible())
+ {
+ LLModalDialog::setFrontmost(FALSE);
+ }
}
else
{