summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llmemory.h12
-rw-r--r--indra/llmath/llvolume.cpp6
-rw-r--r--indra/newview/llvovolume.cpp3
3 files changed, 10 insertions, 11 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index d0e4bc9e25..61e30f11cc 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -188,14 +188,14 @@ inline void ll_aligned_free_32(void *p)
//
inline void ll_memcpy_nonaliased_aligned_16(char* __restrict dst, const char* __restrict src, size_t bytes)
{
- llassert(src != NULL);
- llassert(dst != NULL);
- llassert(bytes >= 16);
- llassert((bytes % sizeof(F32))== 0);
- llassert((src < dst) ? ((src + bytes) < dst) : ((dst + bytes) < src));
- llassert(bytes%16==0);
+ assert(src != NULL);
+ assert(dst != NULL);
+ assert(bytes > 0);
+ assert((bytes % sizeof(F32))== 0);
ll_assert_aligned(src,16);
ll_assert_aligned(dst,16);
+ assert((src < dst) ? ((src + bytes) < dst) : ((dst + bytes) < src));
+ assert(bytes%16==0);
char* end = dst + bytes;
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 7f221fd686..602f2c29e5 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -4729,13 +4729,13 @@ void LLVolumeFace::optimize(F32 angle_cutoff)
}
}
- // disallow data amplification
+ // Only swap data if we've actually optimized the mesh
//
if (new_face.mNumVertices <= mNumVertices)
{
llassert(new_face.mNumIndices == mNumIndices);
- swapData(new_face);
- }
+ swapData(new_face);
+ }
}
class LLVCacheTriangleData;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index e39d2862fb..3ce32b40bb 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2993,8 +2993,7 @@ void LLVOVolume::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_p
//transform view vector into volume space
view_vector -= getRenderPosition();
- // WTF...why is silhouette generation touching a variable used all over the place?!
- //mDrawable->mDistanceWRTCamera = view_vector.length();
+ mDrawable->mDistanceWRTCamera = view_vector.length();
LLQuaternion worldRot = getRenderRotation();
view_vector = view_vector * ~worldRot;
if (!isVolumeGlobal())