summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-08-18 16:50:13 -0500
committerDave Parks <davep@lindenlab.com>2011-08-18 16:50:13 -0500
commit299a01470402de0327fc7f839e5937fc6b60bf63 (patch)
tree6d9408f5c28c3887e58faddbcc0d5732e82f3845 /indra/newview
parent0325d9060e40bb02794c1cf720188d73db5ca8a6 (diff)
parent1b36b0425119ce1e96eeeb87af7f150a206e62b0 (diff)
merge
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 0c8fd33113..d55849d2fb 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2705,6 +2705,12 @@ void LLModelLoader::processElement( daeElement* element, bool& badElement )
{
LLMatrix4 transformation = mTransform;
+ if (mTransform.determinant() < 0)
+ { //negative scales are not supported
+ llinfos << "Negative scale detected, unsupported transform. domInstance_geometry: " << LLModel::getElementLabel(instance_geo) << llendl;
+ badElement = true;
+ }
+
std::map<std::string, LLImportMaterial> materials = getMaterials(model, instance_geo);
// adjust the transformation to compensate for mesh normalization