diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-03-10 20:34:43 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-03-10 20:34:43 -0400 |
| commit | 9c29000ba2f8192985ad0bf20889739ad12dd569 (patch) | |
| tree | 3670a18100453ef589a04d40da5aa314b99f5d11 /indra/newview/llprogressview.cpp | |
| parent | 71e237a3f79cd90b432205460fe6e5c6b536d9db (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merge. Refresh from viewer-release after 3.7.3 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() |