diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:36:22 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-31 00:36:22 +0300 |
| commit | 55da4ea8bb91e55793cee998c6a8cc5090fc84e5 (patch) | |
| tree | 139c8fdc044d62f3517fd1354507a7dd2b98ea83 /indra/llui/llmenubutton.h | |
| parent | 8db0740bd622892bdade2cd4e65cc3e4f9a4da47 (diff) | |
| parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) | |
Merge branch 'master' into DRTVWR-565-maint-P
# Conflicts:
# indra/newview/llfloateroutfitsnapshot.cpp
Diffstat (limited to 'indra/llui/llmenubutton.h')
| -rw-r--r-- | indra/llui/llmenubutton.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llmenubutton.h b/indra/llui/llmenubutton.h index 67ec1983b3..e42f8f53bd 100644 --- a/indra/llui/llmenubutton.h +++ b/indra/llui/llmenubutton.h @@ -41,7 +41,8 @@ public: { MP_TOP_LEFT, MP_TOP_RIGHT, - MP_BOTTOM_LEFT + MP_BOTTOM_LEFT, + MP_BOTTOM_RIGHT } EMenuPosition; struct MenuPositions |