summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-03-29 16:32:28 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-03-29 16:32:28 -0700
commite69aa18c0dfbef2fa3bbefeba08fa1c258c69fb3 (patch)
tree15f1c538a9feb8b02cf54f97d36e0c908889322a /indra/newview/llfloatermodelpreview.cpp
parent7c993e449067a70e8008f97595c2ddb9a916c86d (diff)
SH-1247 Upload Wizard should pull in textures, if defined in .dae
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 68373981df..4d498840fe 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -4218,9 +4218,9 @@ BOOL LLModelPreview::render()
glColor4fv(instance.mMaterial[i].mDiffuseColor.mV);
if (i < instance.mMaterial.size() && instance.mMaterial[i].mDiffuseMap.notNull())
{
- gGL.getTexUnit(0)->bind(instance.mMaterial[i].mDiffuseMap, true);
if (instance.mMaterial[i].mDiffuseMap->getDiscardLevel() > -1)
{
+ gGL.getTexUnit(0)->bind(instance.mMaterial[i].mDiffuseMap, true);
mTextureSet.insert(instance.mMaterial[i].mDiffuseMap.get());
}
}