summaryrefslogtreecommitdiff
path: root/indra/newview/lltoast.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-06-03 19:07:23 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-06-03 19:07:23 +0300
commitcdab7667320164666682cf46b79faf9d8c5e037b (patch)
tree5e377cb7077f82a32cb7913b1cc1580b4b39befd /indra/newview/lltoast.cpp
parent2af1fd0c62b06869253d7d68599365973821bab3 (diff)
parent797c1dbc6ef1c51755dcace98caf0c493cd8f511 (diff)
Merge from default branch
--HG-- branch : product-engine
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
{