From e5124431b54d4342d4677371fccca5bc7250c079 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Mon, 2 Jul 2007 17:10:30 +0000
Subject: svn merge -r 64079:64548
 svn+ssh://svn/svn/linden/branches/maintenance into release

---
 indra/llcommon/llenum.h         | 2 +-
 indra/llcommon/metaclass.cpp    | 3 +++
 indra/llcommon/metaproperty.cpp | 3 +++
 indra/llcommon/reflective.cpp   | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llenum.h b/indra/llcommon/llenum.h
index 7443fe9d0f..7d48b91005 100644
--- a/indra/llcommon/llenum.h
+++ b/indra/llcommon/llenum.h
@@ -32,7 +32,7 @@ public:
 		}
 	}
 
-	const U32 operator[](std::string str)
+	U32 operator[](std::string str)
 	{
 		std::map<const std::string, const U32>::iterator itor;
 		itor = mEnumMap.find(str);
diff --git a/indra/llcommon/metaclass.cpp b/indra/llcommon/metaclass.cpp
index 29ad20e6b6..0cd5179f04 100644
--- a/indra/llcommon/metaclass.cpp
+++ b/indra/llcommon/metaclass.cpp
@@ -8,7 +8,10 @@
  * $License$
  */
 
+#include "linden_common.h" 
+
 #include "metaclass.h"
+
 #include "metaproperty.h"
 #include "reflective.h"
 
diff --git a/indra/llcommon/metaproperty.cpp b/indra/llcommon/metaproperty.cpp
index adcda03389..25a98f47f3 100644
--- a/indra/llcommon/metaproperty.cpp
+++ b/indra/llcommon/metaproperty.cpp
@@ -8,7 +8,10 @@
  * $License$
  */
 
+#include "linden_common.h" 
+
 #include "metaproperty.h"
+
 #include "metaclass.h"
 
 LLMetaProperty::LLMetaProperty(const std::string& name, const LLMetaClass& object_class) : 
diff --git a/indra/llcommon/reflective.cpp b/indra/llcommon/reflective.cpp
index 039a500575..d24aac41bc 100644
--- a/indra/llcommon/reflective.cpp
+++ b/indra/llcommon/reflective.cpp
@@ -7,6 +7,8 @@
  * Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.
  * $License$
  */
+
+#include "linden_common.h" 
  
 #include "reflective.h"
 
-- 
cgit v1.2.3