diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-09 01:09:20 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-09 01:09:20 +0000 |
| commit | b36dc363061ec5bf6b092c14193198e9a5eef816 (patch) | |
| tree | b067586bd545dfa6dce9dd0b1243b9c0aa143f33 /indra/newview/llface.cpp | |
| parent | 6fa974fc64b172a7324b28d40f08f2a861d87f8d (diff) | |
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 64edcecdc6..bb76957da1 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -711,11 +711,13 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f, const LLVolumeFace &face = volume.getVolumeFace(f); //get bounding box - if (mDrawablep->isState(LLDrawable::REBUILD_ALL)) + if (mDrawablep->isState(LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION)) { - //vertex buffer no longer valid - mVertexBuffer = NULL; - mLastVertexBuffer = NULL; + if (mDrawablep->isState(LLDrawable::REBUILD_VOLUME)) + { //vertex buffer no longer valid + mVertexBuffer = NULL; + mLastVertexBuffer = NULL; + } LLVector3 min,max; |