diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-24 23:36:55 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-24 23:36:55 -0600 |
| commit | 56c0d25ec88df661a15bd1401efd4a9f67b86328 (patch) | |
| tree | 87261a499fdcaa284880722536af8abda7fb12e8 /indra/newview | |
| parent | 3c78771acee787e087bd2e2391397794d4d98f6d (diff) | |
Fix for attempting to load mesh as texture.
Fix for failing to retry when mesh uploads fail.
Fix for race condition deadlocking mesh fetching thread.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 562c733a3e..726673013b 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1021,7 +1021,7 @@ void LLVOVolume::updateSculptTexture() { LLPointer<LLViewerFetchedTexture> old_sculpt = mSculptTexture; - if (isSculpted()) + if (isSculpted() && !isMesh()) { LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT); LLUUID id = sculpt_params->getSculptTexture(); |