summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-09-04 11:28:42 -0700
committerAura Linden <aura@lindenlab.com>2014-09-04 11:28:42 -0700
commit983ab95365cf45138aa05ab694c492fc141be2a8 (patch)
tree6585085e49d234a11a21bbfe791a645593d8fa01 /indra/newview/llvoicevivox.cpp
parente77f33f8de63d2de2738f2e9af9cb797adc115c9 (diff)
Added code to allow alternate directory destination for vivox log.
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rwxr-xr-xindra/newview/llvoicevivox.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 0387b18673..f980f886cf 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -810,7 +810,13 @@ void LLVivoxVoiceClient::stateMachine()
params.args.add("-ll");
params.args.add(loglevel);
- std::string log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+ std::string log_folder = gSavedSettings.getString("VivoxLogDirectory");
+
+ if (log_folder.empty())
+ {
+ log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+ }
+
params.args.add("-lf");
params.args.add(log_folder);