summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.h
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-01 18:02:48 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-01 18:02:48 +0200
commitfaf69f407fa95d9dc19f6d737f606e18ab32d052 (patch)
treec19376fa42061e5eee4e55d55cb8cb0a48e26fda /indra/llui/llmenugl.h
parent9f0faf5c892bba9703c713a29202a8ac48bfdf8b (diff)
parent701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff)
Merge branch 'main' into marchcat/yz-merge
# Conflicts: # indra/newview/llinventorygallery.cpp
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r--indra/llui/llmenugl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 87e3f18ebc..5c51cf8465 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -235,10 +235,10 @@ public:
struct Params : public LLInitParam::Block<Params, LLMenuItemGL::Params>
{
Optional<EnableCallbackParam > on_visible;
- Params() : on_visible("on_visible")
- {}
+ Params();
};
- LLMenuItemSeparatorGL(const LLMenuItemSeparatorGL::Params& p = LLMenuItemSeparatorGL::Params());
+
+ LLMenuItemSeparatorGL(const LLMenuItemSeparatorGL::Params& p = LLMenuItemSeparatorGL::Params());
/*virtual*/ void draw( void );
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);