diff options
| author | James Cook <james@lindenlab.com> | 2010-03-10 20:32:56 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-10 20:32:56 -0800 |
| commit | f0d3ea53cd570eeca88df1d0c7d8a73c0877789b (patch) | |
| tree | 7cfb648d666fcfeaf7fc5ef2b13bb21870bedc0a /indra/llui/llfloater.cpp | |
| parent | dbc22bea7bba0c903a5090b24814f97b61a604b6 (diff) | |
| parent | dcbf0ab31ba256791e58dfc2aa3bf61609a8a797 (diff) | |
Merge latest from viewer-hotfix, including fix for TOS screen
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); } |