summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-06-09 18:29:46 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-06-09 18:30:48 +0300
commit5afedc9177893daa4c60ee2c20471241b4b38dc8 (patch)
treed29d964d4d24459079b5783cd5ed5b1f4f1a797e
parent39cf42e6eb0460e6b752a90e4920d8869d83ed51 (diff)
SL-3584 Alpha masked textures occasionally changing to alpha mode none
-rw-r--r--indra/newview/llvovolume.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 2ffd462ac3..34b801a097 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2319,7 +2319,8 @@ bool LLVOVolume::notifyAboutCreatingTexture(LLViewerTexture *texture)
//setup new materials
for(map_te_material::const_iterator it = new_material.begin(), end = new_material.end(); it != end; ++it)
{
- LLMaterialMgr::getInstance()->put(getID(), it->first, *it->second);
+ // These are placeholder materials, they shouldn't be sent to server
+ LLMaterialMgr::getInstance()->setLocalMaterial(getRegion()->getRegionID(), it->second);
LLViewerObject::setTEMaterialParams(it->first, it->second);
}