diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-03 14:14:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-03 14:14:43 -0500 |
| commit | d4910e15a68368d3cebbda1485da4fb68b45ed62 (patch) | |
| tree | 41fd69eddd1d902784bb16af0124a736eabd8e58 /indra/newview/llmaterialmgr.h | |
| parent | c309a7bd9446cc942830998b1f5873cc62e9dffb (diff) | |
changes needed to compile with Linden-standard toolchain
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index 5a0064ae27..0b7217445a 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -35,7 +35,7 @@ class LLViewerRegion; class LLMaterialMgr : public LLSingleton<LLMaterialMgr> { - friend LLSingleton<LLMaterialMgr>; + friend class LLSingleton<LLMaterialMgr>; protected: LLMaterialMgr(); virtual ~LLMaterialMgr(); @@ -69,8 +69,8 @@ protected: 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; + typedef std::pair<const LLUUID, LLMaterialID> pending_material_t; + typedef std::map<const 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; |