diff options
author | prep <none@none> | 2012-03-13 15:48:24 -0400 |
---|---|---|
committer | prep <none@none> | 2012-03-13 15:48:24 -0400 |
commit | fab57eea612f34ed9d8c8559674ead1760aab42b (patch) | |
tree | 51394d44e1b89bb75d168464aec539f60f44f8cd /indra/newview/llfloatersidepanelcontainer.cpp | |
parent | 87b414c4934d0d52eef0b323245568bb1e95ec70 (diff) | |
parent | 00717147d2b832fa3239267edf409f0a1dfcd9fd (diff) |
pull and merge from viewer-development
Diffstat (limited to 'indra/newview/llfloatersidepanelcontainer.cpp')
-rw-r--r-- | indra/newview/llfloatersidepanelcontainer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp index be7a53491d..5385977d95 100644 --- a/indra/newview/llfloatersidepanelcontainer.cpp +++ b/indra/newview/llfloatersidepanelcontainer.cpp @@ -59,7 +59,10 @@ LLPanel* LLFloaterSidePanelContainer::openChildPanel(const std::string& panel_na LLView* view = findChildView(panel_name, true); if (!view) return NULL; - openFloater(); + if (!getVisible()) + { + openFloater(); + } LLPanel* panel = NULL; |