summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.h
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-06-12 15:01:23 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-06-12 15:01:23 -0700
commit8ad2c0b8fbd586a8a9c4f090180c45eef1810a65 (patch)
tree6716851c8cf695d97fd7f2167709965956adb5bf /indra/newview/llpanelface.h
parentb60ea52902c86302bc39bb3812b4d0711eaa9bef (diff)
NORSPEC-260 fix issues with OK after pressing none being intepreted as add a null normal map
Diffstat (limited to 'indra/newview/llpanelface.h')
-rwxr-xr-xindra/newview/llpanelface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index a324be7e7e..222f8f3688 100755
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -300,7 +300,7 @@ private:
if (tep)
{
material_ptr = tep->getMaterialParams();
- if (!material_ptr.isNull() && !tep->getMaterialID().isNull())
+ if (!material_ptr.isNull())
{
ret = (material_ptr->*(MaterialGetFunc))();
}