diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:00:32 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:00:32 +0300 |
commit | e5a428f36246dc9ce7888d7f5a4ec8714565298c (patch) | |
tree | 12d0b7ed497aa4d1ec6dee8a36190ffe961a59ed /indra/llui/llmenugl.h | |
parent | 455db074b0bd286031f075f251abe7caa5a2c76e (diff) | |
parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) |
Merge branch 'master' into DRTVWR-521-maint
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r-- | indra/llui/llmenugl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 8cef9c6463..273bd789c4 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -519,7 +519,7 @@ public: void createJumpKeys(); // Show popup at a specific location, in the spawn_view's coordinate frame - static void showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y); + static void showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y, S32 mouse_x = 0, S32 mouse_y = 0); // Whether to drop shadow menu bar void setDropShadowed( const BOOL shadowed ); |