summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.h
diff options
context:
space:
mode:
authorcallum <none@none>2009-11-10 15:51:41 -0800
committercallum <none@none>2009-11-10 15:51:41 -0800
commitc50072b5482bea46f62931e075f811fbce92293d (patch)
treef76f50b8d3327e270df511d56d7da9482f903010 /indra/llui/llmenugl.h
parent0eaf4b2bb27eec073d39bb6134193be905d8b6a9 (diff)
parent5f5a5b12eda3f9bd7c2c86961dbe1753c1f21f0b (diff)
Merge with tip
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r--indra/llui/llmenugl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index dc8ed3b3fd..cbb9b4d344 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -746,7 +746,9 @@ private:
class LLMenuHolderGL : public LLPanel
{
public:
- LLMenuHolderGL();
+ struct Params : public LLInitParam::Block<Params, LLPanel::Params>
+ {};
+ LLMenuHolderGL(const Params& p);
virtual ~LLMenuHolderGL() {}
virtual BOOL hideMenus();