summaryrefslogtreecommitdiff
path: root/indra/newview/llpopupview.h
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2010-12-17 15:54:00 -0500
committerMonty Brandenberg <monty@lindenlab.com>2010-12-17 15:54:00 -0500
commitdb11a76d519ebb076ec0b72284993d7f6c15f383 (patch)
tree2fa7986e0e0ba9a39b2d2d3722ce1769ce6c2684 /indra/newview/llpopupview.h
parent3c05ebd28635e867f9726062b08cdbf4a7b53b22 (diff)
parentfb8ba15801f0620699fecdf2ed08668df0be7210 (diff)
Merge from viewer-development post 2.4 release
Diffstat (limited to 'indra/newview/llpopupview.h')
-rw-r--r--indra/newview/llpopupview.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpopupview.h b/indra/newview/llpopupview.h
index fec4afd79c..b378f61984 100644
--- a/indra/newview/llpopupview.h
+++ b/indra/newview/llpopupview.h
@@ -32,7 +32,7 @@
class LLPopupView : public LLPanel
{
public:
- LLPopupView();
+ LLPopupView(const Params& p = LLPanel::Params());
~LLPopupView();
/*virtual*/ void draw();