From 25a8ccd36427cb2e30dd140ac1fa1fa6639b5de4 Mon Sep 17 00:00:00 2001
From: Soft Linden <soft@lindenlab.com>
Date: Fri, 19 Mar 2010 14:22:00 -0700
Subject: DEV-46613 Non-sculpty with sculpty parameters corrupts all similar
geometries
---
indra/newview/llvovolume.cpp | 7 +++++--
1 file 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
{
--
cgit v1.2.3