diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 1f74a37300..4ede8d1ec7 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -33,6 +33,9 @@
 #include "llviewertexture.h"
 #include "llvolume.h"
 
+#include "fscommon.h"
+#include <boost/unordered_map.hpp>
+
 #define LLCONVEXDECOMPINTER_STATIC 1
 
 #include "llconvexdecomposition.h"
@@ -570,7 +573,10 @@ public:
 	typedef std::map<LLVolumeParams, std::set<LLUUID> > mesh_load_map;
 	mesh_load_map mLoadingMeshes[4];
 	
-	typedef std::map<LLUUID, LLMeshSkinInfo> skin_map;
+	// <FS:Ansariel> Faster lookup
+	//typedef std::map<LLUUID, LLMeshSkinInfo> skin_map;
+	typedef boost::unordered_map<LLUUID, LLMeshSkinInfo, FSUUIDEntryHasher> skin_map;
+	// </FS:Ansariel>
 	skin_map mSkinMap;
 
 	typedef std::map<LLUUID, LLModel::Decomposition*> decomposition_map;