livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add dullahan to the whitelist for linux and win 

if I can find mac I'll add it later.
master
Beq 2024-06-19 02:00:14 +01:00
parent b5a1897c9f
commit 610a0337ed
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/fsfloaterwhitelisthelper.cpp
View File

@ -50,10 +50,14 @@ void FSFloaterWhiteListHelper::populateWhitelistInfo()
// On windows use exe (not work or RO) directory
std::string voiceexe_path = gDirUtilp->getExecutableDir();
gDirUtilp->append(voiceexe_path, "SLVoice.exe");
std::string dullahan_path = gDirUtilp->getLLPluginDir();
std::string dullahan_exe = "dullahan_host.exe";
#elif LL_DARWIN
// On MAC use resource directory
std::string voiceexe_path = gDirUtilp->getAppRODataDir();
gDirUtilp->append(voiceexe_path, "SLVoice");
std::string dullahan_path = ""; // ignore dullahan on mac until we can identify it accurately
std::string dullahan_exe = "";
#else
std::string voiceexe_path = gDirUtilp->getExecutableDir();
bool usingWine = gSavedSettings.getBOOL("FSLinuxEnableWin64VoiceProxy");
@ -65,8 +69,12 @@ void FSFloaterWhiteListHelper::populateWhitelistInfo()
{
gDirUtilp->append(voiceexe_path, "win64/SLVoice.exe"); // use bundled win64 version
}
std::string dullahan_path = gDirUtilp->getExecutableDir(); // linux keeps dullahan in the bin folder
std::string dullahan_exe = "dullahan_host";
#endif
gDirUtilp->append(dullahan_path, dullahan_exe);
const std::string slpluginexe_path = gDirUtilp->getLLPluginLauncher();
std::string whitelist_folder_info =
@ -80,7 +88,10 @@ void FSFloaterWhiteListHelper::populateWhitelistInfo()
+ gDirUtilp->getBaseFileName(voiceexe_path, false) + "\n" // " Voice Binary"
+ voiceexe_path + "\n" // slvoice full path
+ gDirUtilp->getBaseFileName(slpluginexe_path, false) + "\n" // SLPlugin Launcher Binary
+ slpluginexe_path + "\n"; // SLPlugin Launcher full path
+ slpluginexe_path + "\n" // SLPlugin Launcher full path
+ gDirUtilp->getBaseFileName(dullahan_path, false) + "\n" // SLPlugin Launcher Binary
+ dullahan_path + "\n"
;
getChild<LLTextEditor>("whitelist_folders_editor")->setText(whitelist_folder_info);
getChild<LLTextEditor>("whitelist_exes_editor")->setText(whitelist_exe_info);

4
indra/newview/skins/default/xui/en/floater_whitelist.xml
View File

@ -38,7 +38,7 @@ Please add these to your AV folder exclusions as shown on the above wiki page.
parse_urls="true"
follows="top|left|right|bottom"
font="SansSerif"
height="100"
height="70"
bg_readonly_color="Transparent"
left="5"
max_length="65536"
@ -63,7 +63,7 @@ Add these to you AV executable exclusions as shown in the above wiki.
parse_urls="true"
follows="top|left|right|bottom"
font="SansSerif"
height="130"
height="160"
bg_readonly_color="Transparent"
left="5"
max_length="65536"