diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 20:54:41 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 20:54:41 +0300 |
| commit | fef6c1f51ef13b4a50fd6eb2c9df2ec61b5d0ab4 (patch) | |
| tree | 4331c683f89b706077ded9d34c1c1f179d887e3c /indra/newview/llvoicevivox.cpp | |
| parent | 76ab0e277588d8f36e2188a8a67628b74eae50a7 (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-516-maint
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 0e78e706bd..8dd061728f 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -359,7 +359,7 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() : // gMuteListp->addObserver(&mutelist_listener); -#if LL_DARWIN || LL_LINUX || LL_SOLARIS +#if LL_DARWIN || LL_LINUX // HACK: THIS DOES NOT BELONG HERE // When the vivox daemon dies, the next write attempt on our socket generates a SIGPIPE, which kills us. // This should cause us to ignore SIGPIPE and handle the error through proper channels. |