diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
| commit | 54bba824228162724a1d46d9c7900e9aa7a077a3 (patch) | |
| tree | 3355699f63f141e5fc0546dfe279b8aa65d40e07 /indra/newview/llpopupview.cpp | |
| parent | f813a25224081e68d4772676909d2cff14407486 (diff) | |
| parent | 78eada5b6c3a8d20a2ea49887ab7c091e4b6fa14 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llpopupview.cpp')
| -rwxr-xr-x | indra/newview/llpopupview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpopupview.cpp b/indra/newview/llpopupview.cpp index 08829c1184..153f0930c2 100755 --- a/indra/newview/llpopupview.cpp +++ b/indra/newview/llpopupview.cpp @@ -27,7 +27,7 @@ #include "llpopupview.h" -static LLRegisterPanelClassWrapper<LLPopupView> r("popup_holder"); +static LLPanelInjector<LLPopupView> r("popup_holder"); bool view_visible_and_enabled(LLView* viewp) { |