diff options
| author | callum_linden <none@none> | 2016-05-23 16:50:56 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-23 16:50:56 -0700 |
| commit | 05fcb7c8126a3f3496d948affe7f2722c9ca8fad (patch) | |
| tree | 159e542492c5c1fab1a04ef8a29b22fd60e4766a /indra/llmath/llvolume.cpp | |
| parent | 50ab1e57ec21f2009013b3bc061047887cdd07d5 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r--[-rwxr-xr-x] | indra/llmath/llvolume.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 8608e45a91..d932eb53a0 100755..100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2202,7 +2202,7 @@ BOOL LLVolume::generate() { rot_mat.rotate(*profile++, tmp); dst->setAdd(tmp,offset); - llassert(dst->isFinite3()); + llassert(dst->isFinite3()); // MAINT-5660; don't know why this happens, does not affect Release builds ++dst; } } @@ -5663,7 +5663,7 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build) tc->mV[0] = (*p)[0]+0.5f; tc->mV[1] = (*p)[1]+0.5f; - llassert(src->isFinite3()); + llassert(src->isFinite3()); // MAINT-5660; don't know why this happens, does not affect Release builds update_min_max(min,max,*src); update_min_max(min_uv, max_uv, *tc); |