diff options
author | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
commit | 706ec08deb3feaea9c5c3516dea657b86b0474c3 (patch) | |
tree | a918eac8a10e43b78d156cb0620520420f0dfc62 /indra/newview/llpanelpicks.cpp | |
parent | d2bb4dae980a887a30b206875d8f9419901ed66a (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Merged in 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, |