=== indra/newview/llcontroldef.cpp
==================================================================
--- indra/newview/llcontroldef.cpp	(revision 376)
+++ indra/newview/llcontroldef.cpp	(local)
@@ -332,6 +332,8 @@
 	gSavedSettings.declareString("VoiceImageLevel5", "29de489d-0491-fb00-7dab-f9e686d31e83", "Texture UUID for voice image level 5");
 	gSavedSettings.declareString("VoiceImageLevel6", "29de489d-0491-fb00-7dab-f9e686d31e83", "Texture UUID for voice image level 6");
 	
+	gSavedSettings.declareString("VoiceHost", "127.0.0.1", "Host where SLVoice runs");
+	gSavedSettings.declareU32("VoicePort", 44124, "Port the voice server runs on");
 	
 	//------------------------------------------------------------------------
 	// Caution Script Permission Prompts
=== indra/newview/llvoiceclient.cpp
==================================================================
--- indra/newview/llvoiceclient.cpp	(revision 376)
+++ indra/newview/llvoiceclient.cpp	(local)
@@ -1377,7 +1377,7 @@
 							sGatewayPID = id;
 						}
 #endif	// LL_WINDOWS
-						mDaemonHost = LLHost("127.0.0.1", 44124);				
+						mDaemonHost = LLHost(gSavedSettings.getString("VoiceHost").c_str(), gSavedSettings.getU32("VoicePort"));
 					}	
 					else
 					{
@@ -1390,7 +1390,7 @@
 					// To do this, launch the gateway on a nearby host like this:
 					//  vivox-gw.exe -p tcp -i 0.0.0.0:44124
 					// and put that host's IP address here.
-					mDaemonHost = LLHost("127.0.0.1", 44124);
+					mDaemonHost = LLHost(gSavedSettings.getString("VoiceHost").c_str(), gSavedSettings.getU32("VoicePort"));
 				}
 
 				mUpdateTimer.start();