diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-07 18:46:51 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-07 18:46:51 +0300 |
| commit | 955bcbb95106e9c0c5d8b75c42c32dde52cc0bb6 (patch) | |
| tree | 663ad1c3e33c002ee7ea1bfa5c86d2b713839aba /indra/newview/llvoicevivox.cpp | |
| parent | bb085a45db845a9bfe8aae83ecc7938f618e9ddc (diff) | |
| parent | 08c0de785f29801c57feebce8fae593f86113777 (diff) | |
Merge mesh-development with sh-2309
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 0db0010688..8b942fbc6a 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -942,7 +942,7 @@ void LLVivoxVoiceClient::stateMachine() if(!mSocket) { - mSocket = LLSocket::create(gAPRPoolp, LLSocket::STREAM_TCP); + mSocket = LLSocket::create(LLSocket::STREAM_TCP); } mConnected = mSocket->blockingConnect(mDaemonHost); |