summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.h
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-06-14 09:41:33 -0700
committerGraham Linden <graham@lindenlab.com>2013-06-14 09:41:33 -0700
commitf04e9363b9daca52c1fd2e675c2646f7e1d05054 (patch)
tree6ab37ca763d176780e776d3dbcb6f6315ad8f4b9 /indra/newview/llpanelface.h
parentfec6ab591ef644ee8058742f16849ca9ff53c6a6 (diff)
NORSPEC-266 fix issues with observer feedback on edits of material map parameters
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 222f8f3688..42c1f6bd48 100755
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -261,7 +261,7 @@ private:
{
LL_DEBUGS("Materials") << "Removing material from object " << object->getID() << " face " << face << LL_ENDL;
LLMaterialMgr::getInstance()->remove(object->getID(),face);
- object->setTEMaterialID(face, LLMaterialID::null);
+ new_material = NULL;
}
else
{