diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-03-19 09:46:24 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-03-19 09:46:24 -0700 |
commit | 40e04fdb3b416a686c66989ee5d44c5eaf97b9fd (patch) | |
tree | 537b95c75bdb4a96a9f663895f89cb73f54c8f67 /indra/llui/llfloater.cpp | |
parent | 70df3c1fa72ae8ecddf144452b4fe032ad48182e (diff) | |
parent | 1a28e325c4d148d2322bc9becb672abf99315a96 (diff) |
Merge with tip
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r-- | indra/llui/llfloater.cpp | 1 |
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); } |