diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-10 15:47:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-10 15:47:27 -0400 |
| commit | 0f3ba54a7ececa4d6f7c247a3ffa3a2f9572268e (patch) | |
| tree | c7d3d7cc7a6d1a22ad7b69f45ade31ef4780f9e6 /indra/newview/llvoicevivox.h | |
| parent | 2b4d3fff706d098076bb6c0a7dce2ca35b83300f (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
merge changes for 3.7.3-release
Diffstat (limited to 'indra/newview/llvoicevivox.h')
| -rwxr-xr-x | indra/newview/llvoicevivox.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h index e2d1585c15..c325d72ba6 100755 --- a/indra/newview/llvoicevivox.h +++ b/indra/newview/llvoicevivox.h @@ -659,6 +659,8 @@ private: LLSocket::ptr_t mSocket; bool mConnected; + // We should kill the voice daemon in case of connection alert + bool mTerminateDaemon; LLPumpIO *mPump; friend class LLVivoxProtocolParser; |