diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-03-17 14:19:42 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-03-17 14:19:42 -0700 |
commit | f232096bba9280dd78ef378612eeb65ae2814307 (patch) | |
tree | 17da0d7b1bd17771691c461919bbba5f1780e905 /indra/newview/llpanelvoiceeffect.cpp | |
parent | 4c225e3fc7b92e68a25efdb1ca8927e266e84ae5 (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Merge with viewer-release
Diffstat (limited to 'indra/newview/llpanelvoiceeffect.cpp')
-rwxr-xr-x | indra/newview/llpanelvoiceeffect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp index 5fec6d967d..7da553801a 100755 --- a/indra/newview/llpanelvoiceeffect.cpp +++ b/indra/newview/llpanelvoiceeffect.cpp @@ -36,7 +36,7 @@ #include "lltransientfloatermgr.h" #include "llvoiceclient.h" -static LLRegisterPanelClassWrapper<LLPanelVoiceEffect> t_panel_voice_effect("panel_voice_effect"); +static LLPanelInjector<LLPanelVoiceEffect> t_panel_voice_effect("panel_voice_effect"); LLPanelVoiceEffect::LLPanelVoiceEffect() : mVoiceEffectCombo(NULL) |