diff options
author | Richard Linden <none@none> | 2010-06-03 15:00:59 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-06-03 15:00:59 -0700 |
commit | f968b6078ba764f9c9ed24be23424b59633cff71 (patch) | |
tree | 51916d8541d3ded8ae79092e2a4df770dfc52e3a /indra/newview/llvoicechannel.cpp | |
parent | fbee0d8ef1cfd97c2ef52398d19d038c145bae67 (diff) | |
parent | 4146416d32f9b1684343a48269a50561388fcef4 (diff) |
merge
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 1b4471a9fe..070663e22f 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -897,9 +897,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)); } |