diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-05-16 09:16:58 +0300 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-05-16 09:16:58 +0300 |
| commit | 75f97d4ffe517d07e4b528de9e5f2d2c800510fb (patch) | |
| tree | 8ada7c313cad821d0e1bc4e983ba040443ed79e1 /indra/llui | |
| parent | 5f05e5841f5e748984a7dd7ac4e18070fc716857 (diff) | |
CHUI-963 (Toggling chat fui button twice tears off nearby chat to lower left corner also deletes other open conversations)
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/llfloater.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index d97569839a..b5e81748a3 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1475,6 +1475,7 @@ void LLFloater::moveResizeHandlesToFront() } } +/*virtual*/ BOOL LLFloater::isFrontmost() { LLFloaterView* floater_view = getParentByType<LLFloaterView>(); diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 26ac4a98ad..6e0df847cf 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -262,7 +262,7 @@ public: static bool isVisible(const LLFloater* floater); static bool isMinimized(const LLFloater* floater); BOOL isFirstLook() { return mFirstLook; } // EXT-2653: This function is necessary to prevent overlapping for secondary showed toasts - BOOL isFrontmost(); + virtual BOOL isFrontmost(); BOOL isDependent() { return !mDependeeHandle.isDead(); } void setCanMinimize(BOOL can_minimize); void setCanClose(BOOL can_close); |