diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-12-21 06:44:41 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-12-21 06:44:41 +0000 |
| commit | df4d167cd13fd89a85e4d30dca94e40c934707d7 (patch) | |
| tree | cde9373bce657013bf04c83ab60b4a4aa826fc76 /indra/newview/llvovolume.cpp | |
| parent | 8fde5f0d3241205067e5d7bf5380757e764eff31 (diff) | |
svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 6867cacfa4..70037d3c20 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -723,6 +723,7 @@ void LLVOVolume::sculpt() S32 current_discard = getVolume()->getSculptLevel(); + llassert_always(current_discard >= -2 && current_discard <= max_discard); if (current_discard == discard_level) // no work to do here return; @@ -756,7 +757,7 @@ BOOL LLVOVolume::calcLOD() S32 cur_detail = 0; - F32 radius = mVolumep->mLODScaleBias.scaledVec(getScale()).magVec(); + F32 radius = getVolume()->mLODScaleBias.scaledVec(getScale()).magVec(); F32 distance = mDrawable->mDistanceWRTCamera; distance *= sDistanceFactor; |