diff options
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index 9e5efd7041..b8722ce90e 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -42,38 +42,41 @@ public: typedef std::map<LLMaterialID, LLMaterialPtr> material_map_t; typedef boost::signals2::signal<void (const LLMaterialID&, const LLMaterialPtr)> get_callback_t; - const LLMaterialPtr get(const LLMaterialID& material_id); - boost::signals2::connection get(const LLMaterialID& material_id, get_callback_t::slot_type cb); + const LLMaterialPtr get(const LLUUID& region_id, const LLMaterialID& material_id); + boost::signals2::connection get(const LLUUID& region_id, const LLMaterialID& material_id, get_callback_t::slot_type cb); typedef boost::signals2::signal<void (const LLUUID&, const material_map_t&)> getall_callback_t; void getAll(const LLUUID& region_id); 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); protected: - bool isGetPending(const LLMaterialID& material_id); + bool isGetPending(const LLUUID& region_id, const LLMaterialID& material_id); bool isGetAllPending(const LLUUID& region_id); - const LLMaterialPtr setMaterial(const LLMaterialID& material_id, const LLSD& material_data); + const LLMaterialPtr setMaterial(const LLUUID& region_id, const LLMaterialID& material_id, const LLSD& material_data); static void onIdle(void*); void processGetQueue(); - void onGetResponse(bool success, const LLSD& content); + void onGetResponse(bool success, const LLSD& content, const LLUUID& region_id); void processGetAllQueue(); void onGetAllResponse(bool success, const LLSD& content, const LLUUID& region_id); void processPutQueue(); void onPutResponse(bool success, const LLSD& content, const LLUUID& object_id); protected: - typedef std::set<LLMaterialID> get_queue_t; - get_queue_t mGetQueue; - typedef std::map<LLMaterialID, F64> get_pending_map_t; - get_pending_map_t mGetPending; + typedef std::set<LLMaterialID> material_queue_t; + typedef std::map<LLUUID, material_queue_t> get_queue_t; + get_queue_t mGetQueue; + typedef std::pair<LLUUID, LLMaterialID> pending_material_t; + typedef std::map<pending_material_t, F64> get_pending_map_t; + get_pending_map_t mGetPending; typedef std::map<LLMaterialID, get_callback_t*> get_callback_map_t; get_callback_map_t mGetCallbacks; typedef std::set<LLUUID> getall_queue_t; - getall_queue_t mGetAllQueue; + getall_queue_t mGetAllQueue; + getall_queue_t mGetAllRequested; typedef std::map<LLUUID, F64> getall_pending_map_t; - getall_pending_map_t mGetAllPending; + getall_pending_map_t mGetAllPending; typedef std::map<LLUUID, getall_callback_t*> getall_callback_map_t; getall_callback_map_t mGetAllCallbacks; |