diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-02-20 17:29:20 +0000 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-02-20 17:29:20 +0000 |
| commit | ea4ebc9a1618a64259895232bf624bef37c54577 (patch) | |
| tree | 25e7d5835427f99c85288c1a7a85c04a93d2f1f2 /indra/newview/llmaterialmgr.h | |
| parent | d0811218381cfa9d201d7b72532e19d98bda250a (diff) | |
| parent | 84e5dc37b60a9aa44139084c3d19b29f98527199 (diff) | |
Merged in ruslantproductengine/viewer-cougar-4cr-2 (pull request #5)
MAINT-7847 The presence of certain Avatars stops local specular textures from "sticking". Yes really.
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: Simon Linden <simon@lindenlab.com>
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index 60b58d17de..843dc66fbc 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -56,6 +56,9 @@ public: boost::signals2::connection getAll(const LLUUID& region_id, getall_callback_t::slot_type cb); void put(const LLUUID& object_id, const U8 te, const LLMaterial& material); void remove(const LLUUID& object_id, const U8 te); + + //explicitly add new material to material manager + void setLocalMaterial(const LLUUID& region_id, LLMaterialPtr material_ptr); private: void clearGetQueues(const LLUUID& region_id); @@ -63,7 +66,8 @@ private: bool isGetAllPending(const LLUUID& region_id) const; void markGetPending(const LLUUID& region_id, const LLMaterialID& material_id); const LLMaterialPtr setMaterial(const LLUUID& region_id, const LLMaterialID& material_id, const LLSD& material_data); - + void setMaterialCallbacks(const LLMaterialID& material_id, const LLMaterialPtr material_ptr); + static void onIdle(void*); static void CapsRecvForRegion(const LLUUID& regionId, LLUUID regionTest, std::string pumpname); |