summaryrefslogtreecommitdiff
path: root/indra/newview/lltoast.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-06-03 14:40:10 -0400
committerLoren Shih <seraph@lindenlab.com>2010-06-03 14:40:10 -0400
commita3246a301623f80edb109391c851774cf459fbe8 (patch)
tree57dce21a2e37eb9f9770dda9ef01a36c064cf561 /indra/newview/lltoast.cpp
parent4f95701895a07066d5b46649d720335da1b62e71 (diff)
parent797c1dbc6ef1c51755dcace98caf0c493cd8f511 (diff)
automated 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
{