summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-03-12 20:01:16 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-03-12 20:01:16 +0200
commita321c51edac7ee75a5b65a1954424e789d1f3b1c (patch)
treed0742fb10f6ea53a11cf3228bad0092390e31059 /indra/llui/llfloater.cpp
parent3e75fe4db1aa3659dfc34598ece090d845ac6c5a (diff)
parentf5c431aa7bce953503b33c957ba024bdd9104e63 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 4cb336f7ea..ab14c08948 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1354,7 +1354,6 @@ void LLFloater::bringToFront( S32 x, S32 y )
// virtual
void LLFloater::setVisibleAndFrontmost(BOOL take_focus)
{
- LLUI::clearPopups();
setVisible(TRUE);
setFrontmost(take_focus);
}