Second Life viewer sources 1.18.4.0-RC

1 files changed, 5 insertions, 2 deletions

diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 9e1c90a..3a74f16 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -2,6 +2,8 @@
  * @file llvoiceclient.cpp
  * @brief Implementation of LLVoiceClient class which is the interface to the voice client process.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <boost/tokenizer.hpp>
@@ -1381,7 +1384,7 @@ void LLVoiceClient::stateMachine()
                                                         sGatewayPID = id;
                                                 }
 #endif  // LL_WINDOWS
-                                                mDaemonHost = LLHost("127.0.0.1", 44124);                               
+                                                mDaemonHost = LLHost(gSavedSettings.getString("VoiceHost").c_str(), gSavedSettings.getU32("VoicePort"));
                                         }       
                                         else
                                         {
@@ -1394,7 +1397,7 @@ void LLVoiceClient::stateMachine()
                                         // 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();