summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-23 14:08:11 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-23 14:08:11 +0000
commite7d9999359dd62509c685181d620b092ed28bc60 (patch)
tree595bc367bef76b80d04f7e3e7d95dfbeb31a13cd /indra/llui/llfloater.cpp
parent11e6e208d43f1347037fb312921a65af138f47b4 (diff)
parentaf77b7713444b9df58f451bdb1f30bdd4754fcbf (diff)
Merge from viewer-2-0
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 33895ac22a..a9accc0ba6 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);
}