diff options
author | callum <none@none> | 2009-11-10 15:51:41 -0800 |
---|---|---|
committer | callum <none@none> | 2009-11-10 15:51:41 -0800 |
commit | c50072b5482bea46f62931e075f811fbce92293d (patch) | |
tree | f76f50b8d3327e270df511d56d7da9482f903010 /indra/llui/llmenugl.h | |
parent | 0eaf4b2bb27eec073d39bb6134193be905d8b6a9 (diff) | |
parent | 5f5a5b12eda3f9bd7c2c86961dbe1753c1f21f0b (diff) |
Merge with tip
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r-- | indra/llui/llmenugl.h | 4 |
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(); |