diff options
author | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
commit | c5d7f3c4c1cf37ca0e68bbe9830bd3f3931476e5 (patch) | |
tree | c2af269fd56c04bb9ddca3d99a0cd68ab9d6c94e /indra/llui/llmenugl.h | |
parent | 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (diff) | |
parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) |
DRTVWR-489: trivial merge conflict fix
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r-- | indra/llui/llmenugl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index f84c4d41eb..9d3be8d94f 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -442,6 +442,7 @@ public: /*virtual*/ void drawBackground(LLMenuItemGL* itemp, F32 alpha); /*virtual*/ void setVisible(BOOL visible); /*virtual*/ bool addChild(LLView* view, S32 tab_group = 0); + /*virtual*/ void deleteAllChildren(); /*virtual*/ void removeChild( LLView* ctrl); /*virtual*/ BOOL postBuild(); |