summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchat.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-04 10:06:34 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-04 10:06:34 -0400
commit0be3b1fdd9821929fc537e1c812f26268979dbf0 (patch)
tree2848e2c95a4006e6c9e5fcad11fe9b1ab2488db3 /indra/newview/llfloaterchat.cpp
parent8decd5a4e6c94e27381186e581cf199ba3ede437 (diff)
parenta23ad02cf568b680a409cf40f69cfb1b1591082c (diff)
merge
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
-rw-r--r--indra/newview/llfloaterchat.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index c2c2e7fe22..2679dbb78b 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -413,8 +413,9 @@ LLColor4 get_text_color(const LLChat& chat)
if (!chat.mPosAgent.isExactlyZero())
{
LLVector3 pos_agent = gAgent.getPositionAgent();
- F32 distance = dist_vec(pos_agent, chat.mPosAgent);
- if (distance > gAgent.getNearChatRadius())
+ F32 distance_squared = dist_vec_squared(pos_agent, chat.mPosAgent);
+ F32 dist_near_chat = gAgent.getNearChatRadius();
+ if (distance_squared > dist_near_chat * dist_near_chat)
{
// diminish far-off chat
text_color.mV[VALPHA] = 0.8f;