diff options
author | Merov Linden <merov@lindenlab.com> | 2014-03-10 15:30:38 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-03-10 15:30:38 -0700 |
commit | 8b5ce1e474ac621fc0d8da029e710734792e319d (patch) | |
tree | d5ad22286bd84418d9ba6356017003d891165243 /indra/newview/llpanelpicks.cpp | |
parent | c64e878333ed86c83b0d82c10cc61d4d8d3e8af2 (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
-rwxr-xr-x | indra/newview/llpanelpicks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index cfbc8f1a94..f0617266db 100755 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -69,7 +69,7 @@ static const std::string CLASSIFIED_ID("classified_id"); static const std::string CLASSIFIED_NAME("classified_name"); -static LLRegisterPanelClassWrapper<LLPanelPicks> t_panel_picks("panel_picks"); +static LLPanelInjector<LLPanelPicks> t_panel_picks("panel_picks"); class LLPickHandler : public LLCommandHandler, |