diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-02 16:14:53 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-02 16:14:53 +0000 |
commit | 210fed642b5fe0d837b9dd84a8988d5f17bbd1c1 (patch) | |
tree | 7a0d53814b5955b7256eb33d7c1a6fd3fafb824a /indra/llui/llfloater.cpp | |
parent | 9a4d079b92d430cc86ddbee36efbd1ca58ddb986 (diff) | |
parent | 0a41542f2388a3b6142a15fef653b3e663e1dcc7 (diff) |
PE merge.
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r-- | indra/llui/llfloater.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index de46d89d6f..3b3e644d10 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -2579,6 +2579,8 @@ void LLFloaterView::pushVisibleAll(BOOL visible, const skip_list_t& skip_list) view->pushVisible(visible); } } + + LLFloaterReg::blockShowFloaters(true); } void LLFloaterView::popVisibleAll(const skip_list_t& skip_list) @@ -2596,6 +2598,8 @@ void LLFloaterView::popVisibleAll(const skip_list_t& skip_list) view->popVisible(); } } + + LLFloaterReg::blockShowFloaters(false); } void LLFloater::setInstanceName(const std::string& name) |