svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

3 files changed, 53 insertions, 4 deletions

diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
new file mode 100644
index 0000000000..5dc4c701a1
--- /dev/null
+++ b/indra/llprimitive/CMakeLists.txt
@@ -0,0 +1,49 @@
+# -*- cmake -*-
+
+project(llprimitive)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLXML)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(llprimitive_SOURCE_FILES
+    llmaterialtable.cpp
+    llprimitive.cpp
+    lltextureanim.cpp
+    lltextureentry.cpp
+    lltreeparams.cpp
+    llvolumemessage.cpp
+    llvolumexml.cpp
+    )
+
+set(llprimitive_HEADER_FILES
+    CMakeLists.txt
+
+    legacy_object_types.h
+    llmaterialtable.h
+    llprimitive.h
+    lltextureanim.h
+    lltextureentry.h
+    lltreeparams.h
+    lltree_common.h
+    llvolumemessage.h
+    llvolumexml.h
+    material_codes.h
+    object_flags.h
+    )
+        
+set_source_files_properties(${llprimitive_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llprimitive_SOURCE_FILES ${llprimitive_HEADER_FILES})
+
+add_library (llprimitive ${llprimitive_SOURCE_FILES})
diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp
index 6d30917bd9..61c9849144 100644
--- a/indra/llprimitive/llmaterialtable.cpp
+++ b/indra/llprimitive/llmaterialtable.cpp
@@ -331,7 +331,7 @@ void LLMaterialTable::initBasicTable()
 	}
 }
 
-BOOL LLMaterialTable::add(U8 mcode, char* name, const LLUUID &uuid)
+BOOL LLMaterialTable::add(U8 mcode, const char* name, const LLUUID &uuid)
 {
 	LLMaterialInfo *infop;
 
diff --git a/indra/llprimitive/llmaterialtable.h b/indra/llprimitive/llmaterialtable.h
index e84e75c677..7dbe7de917 100644
--- a/indra/llprimitive/llmaterialtable.h
+++ b/indra/llprimitive/llmaterialtable.h
@@ -79,12 +79,12 @@ public:
 	F32			mDamageModifier;	// modifier on KE based damage
 	F32			mEPModifier;		// modifier on mass based EP total
 
-	LLMaterialInfo(U8 mcode, char* name, const LLUUID &uuid)
+	LLMaterialInfo(U8 mcode, const char* name, const LLUUID &uuid)
 	{
 		init(mcode,name,uuid);
 	};
 
-	void init(U8 mcode, char* name, const LLUUID &uuid)
+	void init(U8 mcode, const char* name, const LLUUID &uuid)
 	{
 		mName[0] = 0;
 		mDensity = 1000.f;             // default to 1000.0 (water)
@@ -150,7 +150,7 @@ public:
 
 	void initBasicTable();
 
-	BOOL add(U8 mcode, char* name, const LLUUID &uuid);	                 
+	BOOL add(U8 mcode, const char* name, const LLUUID &uuid);	                 
 	BOOL addCollisionSound(U8 mcode, U8 mcode2, const LLUUID &uuid);
 	BOOL addSlidingSound(U8 mcode, U8 mcode2, const LLUUID &uuid);
 	BOOL addRollingSound(U8 mcode, U8 mcode2, const LLUUID &uuid);