diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:29:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 10:29:47 +0300 |
| commit | 5118ba7adfc6f49f5b23694507dc7ceb8365b969 (patch) | |
| tree | 4e499acfe5617682c5eca52998b5c10cdac8609a /indra/llui/llmenugl.h | |
| parent | 16e638db975278f6018fe1e21ba1954b7f159149 (diff) | |
| parent | 84dfe55810815e8c274044cea5c81aaed89a787f (diff) | |
Merge pull request #1179 from secondlife/marchcat/y-merge
Release (Maint W) -> Maint YZ merge
Diffstat (limited to 'indra/llui/llmenugl.h')
| -rw-r--r-- | indra/llui/llmenugl.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 5c51cf8465..44ac61f20d 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -562,7 +562,9 @@ public: // add a context menu branch BOOL appendContextSubMenu(LLMenuGL *menu); -protected: + const LLFontGL *getFont() const { return mFont; } + + protected: void createSpilloverBranch(); void cleanupSpilloverBranch(); // Add the menu item to this menu. @@ -594,6 +596,9 @@ protected: BOOL mKeepFixedSize; BOOL mNeedsArrange; + // Font for top menu items only + const LLFontGL* mFont; + private: |