1 files changed, 11 insertions, 10 deletions

diff --git a/linden/indra/llprimitive/material_codes.h b/linden/indra/llprimitive/material_codes.h
index ed159bc..c63f295 100644
--- a/linden/indra/llprimitive/material_codes.h
+++ b/linden/indra/llprimitive/material_codes.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2009, Linden Research, Inc.
+ * Copyright (c) 2000-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -33,7 +33,7 @@
 #ifndef LL_MATERIAL_CODES_H
 #define LL_MATERIAL_CODES_H
 
-#include "lluuid.h"
+class LLUUID;
 
         // material types
 const U8        LL_MCODE_STONE   = 0;
@@ -47,13 +47,14 @@ const U8	LL_MCODE_LIGHT   = 7;
 const U8    LL_MCODE_END     = 8;
 const U8        LL_MCODE_MASK    = 0x0F;
 
-extern LLUUID const LL_DEFAULT_STONE_UUID;
-extern LLUUID const LL_DEFAULT_METAL_UUID;
-extern LLUUID const LL_DEFAULT_GLASS_UUID;
-extern LLUUID const LL_DEFAULT_WOOD_UUID;
-extern LLUUID const LL_DEFAULT_FLESH_UUID;
-extern LLUUID const LL_DEFAULT_PLASTIC_UUID;
-extern LLUUID const LL_DEFAULT_RUBBER_UUID;
-extern LLUUID const LL_DEFAULT_LIGHT_UUID;
+// *NOTE: Define these in .cpp file to reduce duplicate instances
+extern const LLUUID LL_DEFAULT_STONE_UUID;
+extern const LLUUID LL_DEFAULT_METAL_UUID;
+extern const LLUUID LL_DEFAULT_GLASS_UUID;
+extern const LLUUID LL_DEFAULT_WOOD_UUID;
+extern const LLUUID LL_DEFAULT_FLESH_UUID;
+extern const LLUUID LL_DEFAULT_PLASTIC_UUID;
+extern const LLUUID LL_DEFAULT_RUBBER_UUID;
+extern const LLUUID LL_DEFAULT_LIGHT_UUID;
 
 #endif