From da5cc13df2d3cff17cb6afb586da278709e9d40a Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 18 Jun 2021 19:11:33 +0300 Subject: SL-15410 Menu search breaks torn off menus --- indra/llui/llmenugl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llui/llmenugl.h') diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 273bd789c4..01e677315b 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -873,6 +873,8 @@ public: virtual BOOL handleKeyHere(KEY key, MASK mask); virtual void translate(S32 x, S32 y); + void updateSize(); + private: LLTearOffMenu(LLMenuGL* menup); @@ -880,7 +882,7 @@ private: LLView* mOldParent; LLMenuGL* mMenu; - F32 mTargetHeight; + S32 mTargetHeight; }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- cgit v1.2.3 From 01be43b7cdd9cc4c06d2d3ff3e1a21bba4ba3e6b Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 3 Aug 2021 17:27:53 +0300 Subject: SL-15426 FIXED Tear off menu visible during logout --- indra/llui/llmenugl.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llui/llmenugl.h') diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 01e677315b..abbfd9a24a 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -883,6 +883,7 @@ private: LLView* mOldParent; LLMenuGL* mMenu; S32 mTargetHeight; + bool mQuitRequested; }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- cgit v1.2.3