diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-22 14:15:58 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-22 14:15:58 -0500 |
| commit | bd84d36c9d08878c895c896e097e8e3310b61cf3 (patch) | |
| tree | e2e333ba15c131dfb25c4baf54bcb98fd2a3bd46 /indra/newview/llvovolume.cpp | |
| parent | 00fdc0acd5e27d353c070706e838a35bf889a536 (diff) | |
| parent | 04712617c55c53dbec1f73a4e8834ebe3167e5ed (diff) | |
merge
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 9fbcd1d32a..14bedaa49c 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1009,6 +1009,8 @@ void LLVOVolume::sculpt() if(!raw_image) { + llassert(discard_level < 0) ; + sculpt_width = 0; sculpt_height = 0; sculpt_data = NULL ; @@ -1040,7 +1042,6 @@ void LLVOVolume::sculpt() if (volume != this && volume->getVolume() == getVolume()) { gPipeline.markRebuild(volume->mDrawable, LLDrawable::REBUILD_GEOMETRY, FALSE); - volume->mSculptChanged = TRUE; } } } |