summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-03-10 18:22:26 -0800
committerRichard Nelson <none@none>2010-03-10 18:22:26 -0800
commitdcbf0ab31ba256791e58dfc2aa3bf61609a8a797 (patch)
tree3d3559b54bc597eba53d5b0b6c5d6cbee274d7af /indra/llui/llfloater.cpp
parent347585cf975afac59ec6b9960e093acd015627f5 (diff)
parent1e5fe95b1d2d4912a3c9d84e2c32ff141f0dc4d9 (diff)
merge
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);
}