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/llprogressview.cpp | |
parent | c64e878333ed86c83b0d82c10cc61d4d8d3e8af2 (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llprogressview.cpp')
-rwxr-xr-x | indra/newview/llprogressview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 989f0b0e60..1257ee7f94 100755 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -59,7 +59,7 @@ S32 gStartImageWidth = 1; S32 gStartImageHeight = 1; const F32 FADE_TO_WORLD_TIME = 1.0f; -static LLRegisterPanelClassWrapper<LLProgressView> r("progress_view"); +static LLPanelInjector<LLProgressView> r("progress_view"); // XUI: Translate LLProgressView::LLProgressView() |