diff options
author | Oz Linden <oz@lindenlab.com> | 2014-03-10 15:47:27 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-03-10 15:47:27 -0400 |
commit | 0f3ba54a7ececa4d6f7c247a3ffa3a2f9572268e (patch) | |
tree | c7d3d7cc7a6d1a22ad7b69f45ade31ef4780f9e6 /indra/newview/llpanelvoiceeffect.cpp | |
parent | 2b4d3fff706d098076bb6c0a7dce2ca35b83300f (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
merge changes for 3.7.3-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) |