diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-12-07 12:57:01 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-12-07 12:57:01 -0600 |
| commit | 0a8e7377e74ab5c35d14a7e3cc43775fb3ed97cb (patch) | |
| tree | c4b56b55ca02827223dc8ba67fd31f7f768c9af6 /indra | |
| parent | fd05f848d3ff5da6d3401b57a78937a9b5a19ce1 (diff) | |
| parent | 55159162364c30c08a6206bae1cc3dd3caaeb0d0 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmath/llcamera.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp index 22ba26f99b..c14c117da9 100644 --- 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 ¢er, 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 ¢er, 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), diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 2461acf197..49e26aacd9 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1303,7 +1303,7 @@ void LLDrawPoolAvatar::getRiggedGeometry(LLFace* face, LLPointer<LLVertexBuffer> face->setPoolType(LLDrawPool::POOL_AVATAR); } - llinfos << "Rebuilt face " << face->getTEOffset() << " of " << face->getDrawable() << " at " << gFrameTimeSeconds << llendl; + //llinfos << "Rebuilt face " << face->getTEOffset() << " of " << face->getDrawable() << " at " << gFrameTimeSeconds << llendl; face->getGeometryVolume(*volume, face->getTEOffset(), mat_vert, mat_normal, offset, true); buffer->flush(); |