summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-06-20 12:10:26 -0500
committerDave Parks <davep@lindenlab.com>2013-06-20 12:10:26 -0500
commit9ea2d90a0dd9ca9ab76583187354533011ef3fcb (patch)
tree93be8f1dd703cd87083cf871c1948671e0a8cb97 /indra/llmath
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
parentf62d04d4256e3ebb7ecf64ea370099c8795e8581 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llmath')
-rwxr-xr-xindra/llmath/llcamera.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp
index 22ba26f99b..c14c117da9 100755
--- a/indra/llmath/llcamera.cpp
+++ b/indra/llmath/llcamera.cpp
@@ -163,7 +163,7 @@ size_t LLCamera::readFrustumFromBuffer(const char *buffer)
S32 LLCamera::AABBInFrustum(const LLVector4a &center, const LLVector4a& radius)
{
- static const LLVector4a scaler[] = {
+ const LLVector4a scaler[] = {
LLVector4a(-1,-1,-1),
LLVector4a( 1,-1,-1),
LLVector4a(-1, 1,-1),
@@ -207,7 +207,7 @@ S32 LLCamera::AABBInFrustum(const LLVector4a &center, const LLVector4a& radius)
S32 LLCamera::AABBInFrustumNoFarClip(const LLVector4a& center, const LLVector4a& radius)
{
- static const LLVector4a scaler[] = {
+ const LLVector4a scaler[] = {
LLVector4a(-1,-1,-1),
LLVector4a( 1,-1,-1),
LLVector4a(-1, 1,-1),