summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2012-02-03 08:49:14 +0200
committerPaul ProductEngine <pguslisty@productengine.com>2012-02-03 08:49:14 +0200
commitca37970a3aa04a3080e80d33036a127802a18450 (patch)
treee8b9ce83b5cd356f8a5bbc54a43c1f57dd4f4161
parent094b3b8f3de20bc6c157fcf94653a9e4f7c9ab5c (diff)
EXP-1840 FIXED (When two inventory windows are open and "properties" are viewed, one window suddenly moves in front of the other window)
- Modified method LLFloaterSidePanelContainer::openChildPanel so that it doesn't open floater each time it's called. Otherwise each time opening child panel of already opened floater, openFloater() will reposition the floater.
-rw-r--r--indra/newview/llfloatersidepanelcontainer.cpp5
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;