diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:08:53 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:08:53 +0300 |
| commit | 07a118889e9a15391e950710864800e8d5c43efc (patch) | |
| tree | c47c0a617f48c57cab2f5a5784f1e4f71880f79c /indra/newview/llvovolume.cpp | |
| parent | 0c5a621e2945133bca35b7d81998a9fb313d05db (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-486
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 95cfe29a80..3bdb8a2981 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2337,8 +2337,7 @@ 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) { - // These are placeholder materials, they shouldn't be sent to server - LLMaterialMgr::getInstance()->setLocalMaterial(getRegion()->getRegionID(), it->second); + LLMaterialMgr::getInstance()->put(getID(), it->first, *it->second); LLViewerObject::setTEMaterialParams(it->first, it->second); } |