summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2016-10-18 11:09:13 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2016-10-18 11:09:13 +0300
commitfceaa9ddf1170390c06c04d7de352fcb846acf62 (patch)
treef4fcf340fcbb60e0712be0698cd2694bd3374e70 /indra/newview
parent759b4f14d8c9160da928c79dde4bdc95f8fa0021 (diff)
MAINT-6817 crash when uploading a mesh if Include skin weights checkbox is clicked before preview appears.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatermodelpreview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index ffeebfd256..745ad4a834 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -3591,7 +3591,7 @@ BOOL LLModelPreview::render()
}
}
- if (has_skin_weights)
+ if (has_skin_weights && lodsReady())
{ //model has skin weights, enable view options for skin weights and joint positions
if (fmp && isLegacyRigValid() )
{