diff --git a/indra/newview/llprefsvoice.cpp b/indra/newview/llprefsvoice.cpp
index c26fcb724..275778de4 100644
--- a/indra/newview/llprefsvoice.cpp
+++ b/indra/newview/llprefsvoice.cpp
@@ -41,6 +41,7 @@
 #include "llkeyboard.h"
 #include "llmodaldialog.h"
 #include "llpanelvoicedevicesettings.h"
+#include "lltrans.h"
 #include "lluictrlfactory.h"
 
 
@@ -133,6 +134,12 @@ BOOL LLPrefsVoice::postBuild()
 	childSetValue("enable_voice_check", enable);
 	onCommitEnableVoiceChat(getChild<LLCheckBoxCtrl>("enable_voice_check"), this);
 
+	if (LLCheckBoxCtrl* check = getChild<LLCheckBoxCtrl>("enable_multivoice_check"))
+	{
+		check->setValue(gSavedSettings.getBOOL("VoiceMultiInstance"));
+		check->setLabel(getString("multivoice_label", LLTrans::getDefaultArgs()));
+	}
+
 	childSetValue("modifier_combo", gSavedSettings.getString("PushToTalkButton"));
 	childSetValue("voice_call_friends_only_check", gSavedSettings.getBOOL("VoiceCallsFriendsOnly"));
 	childSetValue("auto_disengage_mic_check", gSavedSettings.getBOOL("AutoDisengageMic"));
@@ -151,6 +158,7 @@ void LLPrefsVoice::apply()
 	gSavedSettings.setBOOL("PushToTalkToggle", childGetValue("push_to_talk_toggle_check"));
 	gSavedSettings.setS32("VoiceEarLocation", childGetValue("ear_location"));
 	gSavedSettings.setBOOL("LipSyncEnabled", childGetValue("enable_lip_sync_check"));
+	gSavedSettings.setBOOL("VoiceMultiInstance", childGetValue("enable_multivoice_check"));
 	
 	if (LLPanelVoiceDeviceSettings* voice_device_settings = getChild<LLPanelVoiceDeviceSettings>("device_settings_panel"))
 	{
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index c2a19cd39..c25f36291 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -2,6 +2,8 @@
 <panel border="true" bottom="-409" height="408" label="Voice Chat" left="102" name="chat" width="517">
 	<text bottom_delta="-20" follows="left|top" left_delta="12" name="voice_unavailable">Voice Chat Is Not Available</text>
 	<check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Enable voice chat" left="8" name="enable_voice_check"/>
+	<check_box bottom_delta="-18" follows="top" height="16" name="enable_multivoice_check"/>
+	<string value="Allow multiple instances of [APP_NAME] to use voice simultaneously (requires restart)" name="multivoice_label"/>
 	<radio_group bottom_delta="-46" draw_border="false" follows="top" height="40" left_delta="20" name="ear_location" width="364">
 		<radio_item bottom="-19" height="16" left="3" name="0">Hear Voice Chat from camera position.</radio_item>
 		<radio_item bottom="-35" height="16" name="1">Hear Voice Chat from avatar position.</radio_item>