diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-14 09:46:37 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-14 09:46:37 +0100 |
| commit | 13fdc6e45887fc99031b1267559912837ed1251e (patch) | |
| tree | e0d4c37dad92181929062469108cc16e504d6d25 /indra/newview/llvoiceclient.cpp | |
| parent | d7e4fa17e80072d609aaadaf060ee8f51f1069eb (diff) | |
| parent | 93317037ee4ed4aa7155ae9253800f8977224f73 (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 2238acd643..298ce3fcec 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -5150,7 +5150,7 @@ LLVoiceClient::participantState *LLVoiceClient::sessionState::addParticipant(con else { // Create a UUID by hashing the URI, but do NOT set mAvatarIDValid. - // This tells both code in LLVoiceClient and code in llfloateractivespeakers.cpp that the ID will not be in the name cache. + // This tells code in LLVoiceClient that the ID will not be in the name cache. setUUIDFromStringHash(result->mAvatarID, uri); } } |