summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-12-30 22:08:25 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-12-30 22:08:25 -0800
commitca9df698db9c7a118d29adfe52f49054c333d982 (patch)
treee9ed36c2c0abc148cf8083786047644f73811d43 /indra/llmath
parent842dcb7e423df42cdf6454b86ad86d29655304dc (diff)
Code review fix from davep - use booling or operator and not binary one
Remove unnecessary state check. Initial dialog work for showing physics cost in upload dialog
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llcamera.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp
index c681e00b32..2ffc56644f 100644
--- a/indra/llmath/llcamera.cpp
+++ b/indra/llmath/llcamera.cpp
@@ -377,7 +377,7 @@ int LLCamera::sphereInFrustum(const LLVector3 &sphere_center, const F32 radius)
{
return 0;
}
- res |= (d > -radius);
+ res = res || (d > -radius);
}
}