livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

master
Dave Parks 2013-03-13 21:13:01 -05:00
parent e95563e10d 5d2fea6262
commit d7a56dbe0d
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llmath/llvector4a.h
View File

@ -93,11 +93,7 @@ public:
LLVector4a()
{ //DO NOT INITIALIZE -- The overhead is completely unnecessary
// This assert is causing spurious referenced before set warnings on GCC 4.3.4
//
#if !LL_LINUX
ll_assert_aligned(this,16);
#endif
}
LLVector4a(F32 x, F32 y, F32 z, F32 w = 0.f)

2
indra/llmath/llvolume.cpp
View File

@ -4733,7 +4733,7 @@ void LLVolumeFace::optimize(F32 angle_cutoff)
//
if (new_face.mNumVertices <= mNumVertices)
{
llassert(new_face.mNumIndices == mNumIndices);
llassert(new_face.mNumIndices == mNumIndices);
swapData(new_face);
}
}