diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-04-25 12:44:53 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-04-25 12:44:53 +0100 |
| commit | 6962cf457bec650acc537eef1c50a5b342d37de5 (patch) | |
| tree | e8665a33e71eb11bc8f1db24db568d7525dffcc0 /indra/newview/llvoicechannel.cpp | |
| parent | 0cdaca2b468bbc0f6d9e7f88bd7e39f8c7c04707 (diff) | |
| parent | 695a7488bbf43ad9f351aa8d9e2c5601fc2c9a21 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
| -rw-r--r-- | indra/newview/llvoicechannel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 7bb1006e93..9ab0bf9552 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -887,9 +887,9 @@ void LLVoiceChannelP2P::setSessionHandle(const std::string& handle, const std::s else { LL_WARNS("Voice") << "incoming SIP URL is not provided. Channel may not work properly." << LL_ENDL; - // In case of incoming AvaLine call generated URI will be differ from original one. - // This is because Avatar-2-Avatar URI is based on avatar UUID but Avaline is not. - // See LLVoiceClient::sessionAddedEvent() -> setUUIDFromStringHash() + // In the case of an incoming AvaLine call, the generated URI will be different from the + // original one. This is because the P2P URI is based on avatar UUID but Avaline is not. + // See LLVoiceClient::sessionAddedEvent() setURI(LLVoiceClient::getInstance()->sipURIFromID(mOtherUserID)); } |