diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llpanelcontents.h | |
parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llpanelcontents.h')
-rw-r--r-- | indra/newview/llpanelcontents.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h index ea06707494..de1914bff9 100644 --- a/indra/newview/llpanelcontents.h +++ b/indra/newview/llpanelcontents.h @@ -46,7 +46,7 @@ class LLPanelContents : public LLPanel { public: virtual BOOL postBuild(); - LLPanelContents(const std::string& name); + LLPanelContents(); virtual ~LLPanelContents(); void refresh(); |