diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-06-06 18:02:07 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-06-06 18:02:07 +0800 |
| commit | 1da579b44e49ad6bb347c00ea8c6288a0eecbf55 (patch) | |
| tree | 47ebc26a5544e9884c88ef876b975ac405514988 | |
| parent | f3eb7559d62fbbee940ac89f34519cc39ea6c91d (diff) | |
Wine-based Vivox-based voice for Linux & FreeBSD
Copy SLVoice.exe, vivoxsdk_x64.dll and ortp_x64.dll to
/usr/libexec/megapahit/ on GNU/Linux and
/usr/local/libexec/megapahit/ on FreeBSD.
I haven't got Wine being able to run anything without crashing
on FreeBSD, but once Wine works there, then voice should work too.
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 3bb23bf126..e03bd1a726 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -935,7 +935,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() gDirUtilp->append(exe_path, "SLVoice"); #else std::string exe_path = gDirUtilp->getExecutableDir(); - gDirUtilp->append(exe_path, "SLVoice"); + gDirUtilp->append(exe_path, "SLVoice.exe"); #endif // See if the vivox executable exists llstat s; @@ -943,7 +943,12 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() { // vivox executable exists. Build the command line and launch the daemon. LLProcess::Params params; +#if LL_LINUX || __FreeBSD__ + params.executable = "wine"; + params.args.add(exe_path); +#else params.executable = exe_path; +#endif // VOICE-88: Cycle through [portbase..portbase+portrange) on // successive tries because attempting to relaunch (after manually |