diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
| commit | 66c078de5e5a6b685d435f7b1a462d64ca80f35e (patch) | |
| tree | a1fe4ac67d499a565ea98b390dedbeef0a62acc2 /indra/newview/llpanelpeople.cpp | |
| parent | 27fd0d1a93da8a2ad1aa445e8d8258f9e910ae8c (diff) | |
| parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index b52f33ec3b..e3a7b749ea 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -158,9 +158,8 @@ protected: const LLVector3d& me_pos = gAgent.getPositionGlobal(); const LLVector3d& item1_pos = mAvatarsPositions.find(item1->getAvatarId())->second; const LLVector3d& item2_pos = mAvatarsPositions.find(item2->getAvatarId())->second; - F32 dist1 = dist_vec(item1_pos, me_pos); - F32 dist2 = dist_vec(item2_pos, me_pos); - return dist1 < dist2; + + return dist_vec_squared(item1_pos, me_pos) < dist_vec_squared(item2_pos, me_pos); } private: id_to_pos_map_t mAvatarsPositions; |