diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-02-19 12:41:49 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-02-19 12:41:49 -0700 |
| commit | 0bf136e13c6b213cacfc6b3fb005a244703d491d (patch) | |
| tree | 76adeb447de371c7af5e9070b2cdda8ec94e3523 /indra/newview/llvovolume.cpp | |
| parent | 4ab945c9f0000ead1eca22eefe0829bf3c15d7da (diff) | |
fix for EXT-5528: Viewer hangs indefinitely after teleporting into this region.
for EXT-5550: Viewer locks up consistently on the same sim.
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; } } } |