diff options
| author | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2018-02-14 20:52:31 +0200 |
|---|---|---|
| committer | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2018-02-14 20:52:31 +0200 |
| commit | 84e5dc37b60a9aa44139084c3d19b29f98527199 (patch) | |
| tree | 56a067c64941f15e9a48d30f226c3444d62d6b9b /indra/newview/llmaterialmgr.h | |
| parent | cc30a9e2f5b9410dcdf323d3ecdd3f6f1e2985db (diff) | |
MAINT-7847 The presence of certain Avatars stops local specular textures from "sticking". Yes really.
FIXED. Allows set material explicitly to material manager.
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); |