diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-02 22:34:20 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-02 22:34:20 -0700 |
| commit | 1d44f4d863217c8e5d18a0073e02e4360bc65e07 (patch) | |
| tree | 6224cf7b95b4271e26ea776654b234aedbb2e256 /indra | |
| parent | 76f78e9919597dcd8d5d7461d050b9dd273577be (diff) | |
fix for MAINT-2167: Sculpts failing to rez
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 5ca8a88884..c0f80cf855 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1133,7 +1133,13 @@ void LLVOVolume::sculpt() S32 max_discard = mSculptTexture->getMaxDiscardLevel(); if (discard_level > max_discard) - discard_level = max_discard; // clamp to the best we can do + { + discard_level = max_discard; // clamp to the best we can do + } + if(discard_level > MAX_DISCARD_LEVEL) + { + return; //we think data is not ready yet. + } S32 current_discard = getVolume()->getSculptLevel() ; if(current_discard < -2) |