From ca186a64014942540baaf280bb3967d2582336bd Mon Sep 17 00:00:00 2001
From: Ricky Curtice <kf6kjg+hg@gmail.com>
Date: Mon, 4 Apr 2011 10:24:43 -0700
Subject: [PATCH] Parenthisized a #define to make it safer, adjusted some notes
(and added a TODO) around some extremely obscure code that needs further
attention but which is outside this scope.
---
doc/contributions.txt | 2 +-
indra/llmath/tests/llbbox_test.cpp | 2 +-
indra/newview/llselectmgr.cpp | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9ba155eecee..ae10957b241 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -237,7 +237,7 @@ Coaldust Numbers
VWR-1095
Cron Stardust
VWR-10579
- VWR-25126
+ STORM-1075
Cypren Christenson
STORM-417
Dale Glass
diff --git a/indra/llmath/tests/llbbox_test.cpp b/indra/llmath/tests/llbbox_test.cpp
index b9e1d29cd7b..fd0dbb58fc3 100644
--- a/indra/llmath/tests/llbbox_test.cpp
+++ b/indra/llmath/tests/llbbox_test.cpp
@@ -34,7 +34,7 @@
#define ANGLE (3.14159265f / 2.0f)
-#define APPROX_EQUAL(a, b) dist_vec_squared((a),(b)) < 1e-10
+#define APPROX_EQUAL(a, b) (dist_vec_squared((a),(b)) < 1e-10)
namespace tut
{
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 262c9a4515c..2c5073d027a 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6589,11 +6589,11 @@ bool LLSelectMgr::selectionMove(const LLVector3& displ,
// note the use of fsqrtf, this was used in the definition of dist_vec() and is therefore re-used here
F32 min_dist = fsqrtf(min_dist_squared);
- // factor the distance inside the displacement vector. This will get us
+ // factor the distance into the displacement vector. This will get us
// equally visible movements for both close and far away selections.
- F32 min_dist_factored = sqrt(min_dist) / 2;
- displ_global.setVec(displ.mV[0]*min_dist_factored,
- displ.mV[1]*min_dist_factored,
+ F32 min_dist_factored = sqrt(min_dist) / 2; // FIXME: this variable name doesn't state its true meaning.
+ displ_global.setVec(displ.mV[0]*min_dist_factored,
+ displ.mV[1]*min_dist_factored,
displ.mV[2]*min_dist_factored);
// equates to: Displ_global = Displ * M_cam_axes_in_global_frame
--
GitLab