summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.h
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-11-11 17:47:20 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-11-11 17:47:20 +0200
commit6146cfc5c1c14f106b54b7394db6286d9b7bb67a (patch)
treef29e14c852a36d1b97defd0f126068deec8ed3b6 /indra/llui/llmenugl.h
parent61fdd33f7916dbf13c5c56e2d4c0ccb14fdae150 (diff)
parent062d0a13db505636b186084d42c527a49637f380 (diff)
Merge from default branch
--HG-- branch : product-engine
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();