diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:38:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:38:29 -0400 |
commit | 383fccbd57ef273aa803497ad87cf9badc5db90a (patch) | |
tree | ab042292d129a92092b35accde69eb57a3565389 /indra/newview/llspeakers.cpp | |
parent | f5bb046c5d3d393352b5b90424837a3d213dfbb9 (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); } |