diff options
| author | Kitty Barnett <develop@catznip.com> | 2013-05-12 13:02:54 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2013-05-12 13:02:54 +0200 |
| commit | c2c9380fe135fd8b191ebe3c9a38129af4994ed8 (patch) | |
| tree | de1071f7a07703295ca515b9248db9fd801ea82b /indra/newview/llmaterialmgr.h | |
| parent | c486d9498b8274e0fd9c7cba616df10f6a7d8977 (diff) | |
Avoid code duplication in LLMaterialMgr
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index 922b16f1cf..a6a7a5d1d7 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -44,11 +44,9 @@ public: typedef std::map<LLMaterialID, LLMaterialPtr> material_map_t; typedef boost::signals2::signal<void (const LLMaterialID&, const LLMaterialPtr)> get_callback_t; - typedef boost::signals2::signal<void (const LLMaterialID&, const LLMaterialPtr, U32 te)> get_callback_te_t; 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); - boost::signals2::connection getTE(const LLUUID& region_id, const LLMaterialID& material_id, U32 te, get_callback_te_t::slot_type cb); typedef boost::signals2::signal<void (const LLUUID&, const material_map_t&)> getall_callback_t; void getAll(const LLUUID& region_id); @@ -82,26 +80,6 @@ protected: typedef std::map<LLMaterialID, get_callback_t*> get_callback_map_t; get_callback_map_t mGetCallbacks; - // struct for TE-specific material ID query - struct TEMaterialPair - { - U32 te; - LLMaterialID materialID; - }; - - // needed for std::map compliance only - // - friend inline bool operator<( - const struct LLMaterialMgr::TEMaterialPair& lhs, - const struct LLMaterialMgr::TEMaterialPair& rhs) - { - return (lhs.materialID < rhs.materialID) ? TRUE : - (lhs.te < rhs.te) ? TRUE : FALSE; - } - - typedef std::map<TEMaterialPair, get_callback_te_t*> get_callback_te_map_t; - get_callback_te_map_t mGetTECallbacks; - typedef std::set<LLUUID> getall_queue_t; getall_queue_t mGetAllQueue; getall_queue_t mGetAllRequested; |