Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On Linux and in standalone mode, first look for SLVoice in the executable path list. If none is found then try to use the one installed with Singularity, if any. Useful for packagers who want to make many sl clients share the same voice program.

Browse Source
This commit is contained in:
Player Dagostino
2011-08-11 06:19:59 +02:00
parent 6ac2d342b3
commit 4683fb4907
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llvoiceclient.cpp
View File

@@ -29,6 +29,9 @@
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#if LL_LINUX && defined(LL_STANDALONE)
#include <glib.h>
#endif
#include "llviewerprecompiledheaders.h"
#include "llvoiceclient.h"
@@ -1635,9 +1638,22 @@ void LLVoiceClient::stateMachine()
{
// Launch the voice daemon
// *FIX:Mani - Using the executable dir instead
// of mAppRODataDir, the working directory from which the app
// is launched.
#if LL_LINUX && defined(LL_STANDALONE)
// Look for the vivox daemon in the executable path list
// using glib first.
char *voice_path = g_find_program_in_path ("SLVoice");
std::string exe_path;
if (voice_path) {
exe_path = llformat("%s", voice_path);
free(voice_path);
} else {
exe_path = gDirUtilp->getExecutableDir() +
gDirUtilp->getDirDelimiter() + "SLVoice";
}
#else
// *FIX:Mani - Using the executable dir instead
// of mAppRODataDir, the working directory from which the
// app is launched.
//std::string exe_path = gDirUtilp->getAppRODataDir();
std::string exe_path = gDirUtilp->getExecutableDir();
exe_path += gDirUtilp->getDirDelimiter();
@@ -1647,6 +1663,7 @@ void LLVoiceClient::stateMachine()
exe_path += "../Resources/SLVoice";
#else
exe_path += "SLVoice";
#endif
#endif
// See if the vivox executable exists
llstat s;