diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
commit | 2e790e9b7250d5f79751fa5287c1993f3fa5c776 (patch) | |
tree | 60dd4f9462ba11a4cb7503c64fa1dd2a23373a67 /indra/newview/llviewermenu.h | |
parent | 1eeb4c85a120b23b853aabb8e6cf984b03dbc17f (diff) | |
parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) |
DRTVWR-538: Merge branch 'master' into c++17
Diffstat (limited to 'indra/newview/llviewermenu.h')
-rw-r--r-- | indra/newview/llviewermenu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index 0f63c8cf58..36b6971c81 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -188,10 +188,14 @@ extern LLContextMenu *gMenuMuteParticle; extern LLMenuGL* gAttachSubMenu; extern LLMenuGL* gDetachSubMenu; extern LLMenuGL* gTakeOffClothes; +extern LLMenuGL* gDetachAvatarMenu; +extern LLMenuGL* gDetachHUDAvatarMenu; extern LLContextMenu* gAttachScreenPieMenu; extern LLContextMenu* gDetachScreenPieMenu; +extern LLContextMenu* gDetachHUDAttSelfMenu; extern LLContextMenu* gAttachPieMenu; extern LLContextMenu* gDetachPieMenu; +extern LLContextMenu* gDetachAttSelfMenu; extern LLContextMenu* gAttachBodyPartPieMenus[9]; extern LLContextMenu* gDetachBodyPartPieMenus[9]; |