From d4910e15a68368d3cebbda1485da4fb68b45ed62 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 3 Jan 2013 14:14:43 -0500
Subject: changes needed to compile with Linden-standard toolchain

---
 indra/newview/llmaterialmgr.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llmaterialmgr.h')

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;
-- 
cgit v1.2.3