diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-03-21 17:46:39 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-03-21 17:46:39 +0200 |
| commit | c2642f3b441cc2e7932ded0f73e7426705cd4e04 (patch) | |
| tree | 84c8c7969e3204cb1bd3f46b81eb528cd2437f59 | |
| parent | 4434c3371cad29b57eafab5cef70be7f3ec463c5 (diff) | |
Local build Voice Fix
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index cf40058c34..2231bda33e 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -770,12 +770,16 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() { #ifndef VIVOXDAEMON_REMOTEHOST // Launch the voice daemon - std::string exe_path = gDirUtilp->getAppRODataDir(); #if LL_WINDOWS + // On windows use exe (not work or RO) directory + std::string exe_path = gDirUtilp->getExecutableDir(); gDirUtilp->append(exe_path, "SLVoice.exe"); #elif LL_DARWIN + // On MAC use resource directory + std::string exe_path = gDirUtilp->getAppRODataDir(); gDirUtilp->append(exe_path, "SLVoice"); #else + std::string exe_path = gDirUtilp->getExecutableDir(); gDirUtilp->append(exe_path, "SLVoice"); #endif // See if the vivox executable exists |