diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:36:39 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:36:39 -0400 |
commit | 3b79c9c81dc1ba4cb92f1ac54bd74a57e6d5aa05 (patch) | |
tree | cf27e69ff2bea8c621d1073172636146b8c73a57 /indra/newview/llspeakers.cpp | |
parent | c3df5f5d675abd107e1f0b4e3fb262226978ddb5 (diff) | |
parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) |
merge changes for viewer-development before mesh merge
Diffstat (limited to 'indra/newview/llspeakers.cpp')
-rw-r--r-- | indra/newview/llspeakers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 40aea05839..c588bd8fb4 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -920,7 +920,7 @@ void LLLocalSpeakerMgr::updateSpeakerList() if (speakerp->mStatus == LLSpeaker::STATUS_TEXT_ONLY) { LLVOAvatar* avatarp = (LLVOAvatar*)gObjectList.findObject(speaker_id); - if (!avatarp || dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) > CHAT_NORMAL_RADIUS) + if (!avatarp || dist_vec_squared(avatarp->getPositionAgent(), gAgent.getPositionAgent()) > CHAT_NORMAL_RADIUS_SQUARED) { setSpeakerNotInChannel(speakerp); } |