diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-04-18 13:29:25 -0700 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-04-18 13:29:25 -0700 |
| commit | e9921e77b0a6c66855204db82d56de7925651a4d (patch) | |
| tree | 510e353b4e773e18f95bd7312c813189f947dbb6 /indra/llui/llmenugl.h | |
| parent | efb9df04c3899c269f0c17d2473b4472d5f31ee5 (diff) | |
| parent | d031662435d97101411ae990ed85d6e001ab668a (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
Diffstat (limited to 'indra/llui/llmenugl.h')
| -rw-r--r-- | indra/llui/llmenugl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 273bd789c4..abbfd9a24a 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,8 @@ private: LLView* mOldParent; LLMenuGL* mMenu; - F32 mTargetHeight; + S32 mTargetHeight; + bool mQuitRequested; }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |