diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-02-07 20:41:53 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-02-07 20:41:53 +0200 |
| commit | 0d40ac2ed9ed206d1f20967c09bf88ce0e5702f5 (patch) | |
| tree | 922f352d813884729325e188ae0a32c1ccaf0dae /indra/newview | |
| parent | 62aa39983950de85784737deb93df8252ac775d5 (diff) | |
MAINT-8258 Don't show sculpty until it is loaded or load fails
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterimagepreview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp index a9e4d752ac..0c2bb25e07 100644 --- a/indra/newview/llfloaterimagepreview.cpp +++ b/indra/newview/llfloaterimagepreview.cpp @@ -793,7 +793,7 @@ void LLImagePreviewSculpted::setPreviewTarget(LLImageRaw* imagep, F32 distance) if (imagep) { - mVolume->sculpt(imagep->getWidth(), imagep->getHeight(), imagep->getComponents(), imagep->getData(), 0); + mVolume->sculpt(imagep->getWidth(), imagep->getHeight(), imagep->getComponents(), imagep->getData(), 0, false); } const LLVolumeFace &vf = mVolume->getVolumeFace(0); diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 2bfdf0790e..d93cae992b 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1200,7 +1200,7 @@ void LLVOVolume::sculpt() mSculptTexture->updateBindStatsForTester() ; } } - getVolume()->sculpt(sculpt_width, sculpt_height, sculpt_components, sculpt_data, discard_level); + getVolume()->sculpt(sculpt_width, sculpt_height, sculpt_components, sculpt_data, discard_level, mSculptTexture->isMissingAsset()); //notify rebuild any other VOVolumes that reference this sculpty volume for (S32 i = 0; i < mSculptTexture->getNumVolumes(); ++i) |