diff options
| author | Soft Linden <soft@lindenlab.com> | 2010-03-19 14:22:00 -0700 |
|---|---|---|
| committer | Soft Linden <soft@lindenlab.com> | 2010-03-19 14:22:00 -0700 |
| commit | 25a8ccd36427cb2e30dd140ac1fa1fa6639b5de4 (patch) | |
| tree | 50b4d25b70131f6954f111f0ffbb265158b6fb1f /indra/newview | |
| parent | e25b39b94bf013b30bb81c8c2d2934ec17e0f77b (diff) | |
DEV-46613 Non-sculpty with sculpty parameters corrupts all similar geometries
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 86d8204473..cb362d557c 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -962,8 +962,11 @@ void LLVOVolume::updateSculptTexture() if (isSculpted()) { LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT); - LLUUID id = sculpt_params->getSculptTexture(); - mSculptTexture = LLViewerTextureManager::getFetchedTexture(id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + LLUUID id = sculpt_params->getSculptTexture(); + if (id.notNull()) + { + mSculptTexture = LLViewerTextureManager::getFetchedTexture(id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + } } else { |