Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public

indra/newview/CMakeLists.txt

indra/newview/app_settings/logcontrol.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_per_account.xml

indra/newview/llcallfloater.cpp

indra/newview/llcallfloater.h

indra/newview/llfloaternotificationsconsole.cpp

indra/newview/llfloatervoiceeffect.cpp

indra/newview/llfloatervoiceeffect.h

indra/newview/llpanelvoiceeffect.cpp

indra/newview/llpanelvoiceeffect.h

indra/newview/llparticipantlist.cpp

indra/newview/llspeakingindicatormanager.cpp

indra/newview/llviewerfloaterreg.cpp

indra/newview/llvoicechannel.cpp

indra/newview/llvoicechannel.h

indra/newview/llvoiceclient.cpp

indra/newview/llvoiceclient.h

indra/newview/llvoicevivox.cpp

indra/newview/llvoicevivox.h