summaryrefslogtreecommitdiff
path: root/indra/newview/llpopupview.h
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-12-09 16:48:07 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-12-09 16:48:07 -0800
commit95445fb1b56a60145933db0891133230c87274b8 (patch)
treef9b03971e89800c68b4c4430b13c90af6cba51e7 /indra/newview/llpopupview.h
parent089665ce4eab97d0ab58e08914f852219ed3fae7 (diff)
parentcf6147f7c092e6ca10697dea341099c5e281df00 (diff)
Merge with viewer-development.
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();