diff options
| author | PavelK ProductEngine <pavelkproductengine@lindenlab.com> | 2013-04-09 20:50:54 +0300 |
|---|---|---|
| committer | PavelK ProductEngine <pavelkproductengine@lindenlab.com> | 2013-04-09 20:50:54 +0300 |
| commit | fa36f85b007a124c418fd8cfc0e836cc7fdc86cf (patch) | |
| tree | 6f111b07c5ab3894fe025477e728917860ef1fe4 /indra/llui | |
| parent | 9ab92603ce9ca54d4ef5571196f34ba5f0875286 (diff) | |
CHUI-797 FIXED Only one separated conversation window is shown after exiting from mouselook view
Added all separated conversation floaters to skip list used in gFloaterView->popVisibleAll(skip_list) in llagent.cpp
since LLFloaterIMContainer::setVisible() takes control of them by itself.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 | ||||
| -rw-r--r-- | indra/llui/llfloater.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 5873df5169..6816137e52 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -3258,6 +3258,11 @@ bool LLFloater::isShown() const return ! isMinimized() && isInVisibleChain(); } +bool LLFloater::isDetachedAndNotMinimized() +{ + return !getHost() && !isMinimized(); +} + /* static */ bool LLFloater::isShown(const LLFloater* floater) { diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 4dba1e645f..26ac4a98ad 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -238,6 +238,7 @@ public: void center(); LLMultiFloater* getHost(); + bool isDetachedAndNotMinimized(); void applyTitle(); std::string getCurrentTitle() const; |