diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-24 15:07:23 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-24 15:07:23 -0700 |
| commit | 66e53759679910e2c3720cda92ba6e917c66d12c (patch) | |
| tree | f8b5123874e440db4ab686ba1e253fe22844e9d2 /indra/newview/llmaterialmgr.h | |
| parent | f66b71262e0ade97134fae8e63fb9323505c3c65 (diff) | |
NORSPEC-96 NORSPEC-189 another attempt at planar stretch across all 3 channels and make the materials CB use a UUID instead of this pointer for safety
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index 8a2a9be255..e317a791ad 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -31,8 +31,6 @@ #include "llmaterialid.h" #include "llsingleton.h" -#define USE_TE_SPECIFIC_REGISTRATION 1 - class LLViewerRegion; class LLMaterialMgr : public LLSingleton<LLMaterialMgr> @@ -49,10 +47,8 @@ public: 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); -#if USE_TE_SPECIFIC_REGISTRATION typedef boost::signals2::signal<void (const LLMaterialID&, const LLMaterialPtr, U32 te)> get_callback_te_t; boost::signals2::connection getTE(const LLUUID& region_id, const LLMaterialID& material_id, U32 te, get_callback_te_t::slot_type cb); -#endif typedef boost::signals2::signal<void (const LLUUID&, const material_map_t&)> getall_callback_t; void getAll(const LLUUID& region_id); @@ -86,7 +82,6 @@ protected: typedef std::map<LLMaterialID, get_callback_t*> get_callback_map_t; get_callback_map_t mGetCallbacks; -#if USE_TE_SPECIFIC_REGISTRATION // struct for TE-specific material ID query class TEMaterialPair { @@ -115,7 +110,6 @@ protected: typedef boost::unordered_map<TEMaterialPair, get_callback_te_t*, TEMaterialPairHasher> get_callback_te_map_t; get_callback_te_map_t mGetTECallbacks; -#endif typedef std::set<LLUUID> getall_queue_t; getall_queue_t mGetAllQueue; |