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, 45 insertions, 1 deletions

diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
new file mode 100644
index 0000000000..d86bc0d564
--- /dev/null
+++ b/indra/llxml/CMakeLists.txt
@@ -0,0 +1,36 @@
+# -*- cmake -*-
+
+project(llxml)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLXML)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    )
+
+set(llxml_SOURCE_FILES
+    llcontrol.cpp
+    llxmlnode.cpp
+    llxmlparser.cpp
+    llxmltree.cpp
+    )
+
+set(llxml_HEADER_FILES
+    CMakeLists.txt
+
+    llcontrol.h
+    llxmlnode.h
+    llxmlparser.h
+    llxmltree.h
+    )
+
+set_source_files_properties(${llxml_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llxml_SOURCE_FILES ${llxml_HEADER_FILES})
+
+add_library (llxml ${llxml_SOURCE_FILES})
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index 0429e30db6..ef6e32a7a0 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -49,7 +49,7 @@
 #include "llxmltree.h"
 #include "llsdserialize.h"
 
-#if LL_RELEASE_FOR_DOWNLOAD
+#if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
 #define CONTROL_ERRS LL_WARNS("ControlErrors")
 #else
 #define CONTROL_ERRS LL_ERRS("ControlErrors")
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index 12160680f1..58cef95ce0 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -79,6 +79,14 @@ typedef std::multimap<LLString, LLXMLNodePtr > LLXMLNodeList;
 typedef std::multimap<const LLStringTableEntry *, LLXMLNodePtr > LLXMLChildList;
 typedef std::map<const LLStringTableEntry *, LLXMLNodePtr, CompareAttributes> LLXMLAttribList;
 
+class LLColor4;
+class LLColor4U;
+class LLQuaternion;
+class LLVector3;
+class LLVector3d;
+class LLVector4;
+class LLVector4U;
+
 struct LLXMLChildren
 {
 	LLXMLChildList map;			// Map of children names->pointers