summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-06-04 12:50:16 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-06-04 12:50:16 +0300
commitfda0c3eb590f39fe04347da0182ba38ab87e8bc2 (patch)
treec512075fce891c1c2310966b66a7c59a8a94ccd2 /indra
parent3f3bac5e913545bcf22e66460bbfec5cb9b655db (diff)
MAINT-1693 FIXED Building Block Type is changed to Torus after cancel changing of texture for sculpted object
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llpanelobject.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index dcd0aab3ab..420f8fde2e 100755
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -2000,7 +2000,11 @@ void LLPanelObject::onCancelSculpt(const LLSD& data)
LLTextureCtrl* mTextureCtrl = getChild<LLTextureCtrl>("sculpt texture control");
if(!mTextureCtrl)
return;
-
+
+ if(mSculptTextureRevert == LLUUID::null)
+ {
+ mSculptTextureRevert = LLUUID(SCULPT_DEFAULT_TEXTURE);
+ }
mTextureCtrl->setImageAssetID(mSculptTextureRevert);
sendSculpt();