diff options
| author | simon <none@none> | 2014-02-21 11:18:12 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-21 11:18:12 -0800 |
| commit | ea944fd58f6fcaf29a939ed10e9fd5e07b9fb923 (patch) | |
| tree | d18a3d5fc4f3220fc6d36d24e8cb1b05630e1f9f /indra/newview/llpanelpicks.cpp | |
| parent | a23fc01c7b12299297124f4b5b6ad4e7a8145c00 (diff) | |
| parent | 76913530ed04798536e8469dbeaea9e512d122aa (diff) | |
Merge downstream code
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, |