diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-10-12 16:24:05 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-10-12 16:24:05 -0400 |
commit | a16a6034c25c5e78331ef1bd13485df8759456e5 (patch) | |
tree | c1d1ef6f387daa81039b27a2cdb435a31c25b5d7 /indra/newview/llpanelface.h | |
parent | 5b58bfb937f7f996c7f1b97f15b1c837aa23a463 (diff) | |
parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelface.h')
-rwxr-xr-x | indra/newview/llpanelface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 9823e84cd9..d7e89b4832 100755 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -307,7 +307,7 @@ private: LLMaterialMgr::getInstance()->put(object->getID(),face,*new_material); } - object->setTEMaterialParams(face, new_material); + object->setTEMaterialParams(face, new_material, TRUE); return new_material; } return NULL; |