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

4 files changed, 141 insertions, 65 deletions

diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt
new file mode 100644
index 0000000000..63010626e1
--- /dev/null
+++ b/indra/llcharacter/CMakeLists.txt
@@ -0,0 +1,76 @@
+# -*- cmake -*-
+
+project(llcharacter)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+include(LLXML)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(llcharacter_SOURCE_FILES
+    llanimationstates.cpp
+    llbvhloader.cpp
+    llcharacter.cpp
+    lleditingmotion.cpp
+    llgesture.cpp
+    llhandmotion.cpp
+    llheadrotmotion.cpp
+    lljoint.cpp
+    lljointsolverrp3.cpp
+    llkeyframefallmotion.cpp
+    llkeyframemotion.cpp
+    llkeyframemotionparam.cpp
+    llkeyframestandmotion.cpp
+    llkeyframewalkmotion.cpp
+    llmotioncontroller.cpp
+    llmotion.cpp
+    llmultigesture.cpp
+    llpose.cpp
+    llstatemachine.cpp
+    lltargetingmotion.cpp
+    llvisualparam.cpp
+    )
+
+set(llcharacter_HEADER_FILES
+    CMakeLists.txt
+
+    llanimationstates.h
+    llbvhloader.h
+    llcharacter.h
+    lleditingmotion.h
+    llgesture.h
+    llhandmotion.h
+    llheadrotmotion.h
+    lljoint.h
+    lljointsolverrp3.h
+    lljointstate.h
+    llkeyframefallmotion.h
+    llkeyframemotion.h
+    llkeyframemotionparam.h
+    llkeyframestandmotion.h
+    llkeyframewalkmotion.h
+    llmotion.h
+    llmotioncontroller.h
+    llmultigesture.h
+    llpose.h
+    llstatemachine.h
+    lltargetingmotion.h
+    llvisualparam.h
+    )
+
+set_source_files_properties(${llcharacter_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llcharacter_SOURCE_FILES ${llcharacter_HEADER_FILES})
+
+add_library (llcharacter ${llcharacter_SOURCE_FILES})
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
index 1d157fd5f5..95147ba842 100644
--- a/indra/llcharacter/llbvhloader.cpp
+++ b/indra/llcharacter/llbvhloader.cpp
@@ -59,37 +59,37 @@ char gOutFile[1024];		/* Flawfinder: ignore */
 //------------------------------------------------------------------------
 // Status Codes
 //------------------------------------------------------------------------
-char *LLBVHLoader::ST_OK				= "Ok";
-char *LLBVHLoader::ST_EOF				= "Premature end of file.";
-char *LLBVHLoader::ST_NO_CONSTRAINT		= "Can't read constraint definition.";
-char *LLBVHLoader::ST_NO_FILE			= "Can't open BVH file.";
-char *LLBVHLoader::ST_NO_HIER			= "Invalid HIERARCHY header.";
-char *LLBVHLoader::ST_NO_JOINT			= "Can't find ROOT or JOINT.";
-char *LLBVHLoader::ST_NO_NAME			= "Can't get JOINT name.";
-char *LLBVHLoader::ST_NO_OFFSET			= "Can't find OFFSET.";
-char *LLBVHLoader::ST_NO_CHANNELS		= "Can't find CHANNELS.";
-char *LLBVHLoader::ST_NO_ROTATION		= "Can't get rotation order.";
-char *LLBVHLoader::ST_NO_AXIS			= "Can't get rotation axis.";
-char *LLBVHLoader::ST_NO_MOTION			= "Can't find MOTION.";
-char *LLBVHLoader::ST_NO_FRAMES			= "Can't get number of frames.";
-char *LLBVHLoader::ST_NO_FRAME_TIME		= "Can't get frame time.";
-char *LLBVHLoader::ST_NO_POS			= "Can't get position values.";
-char *LLBVHLoader::ST_NO_ROT			= "Can't get rotation values.";
-char *LLBVHLoader::ST_NO_XLT_FILE		= "Can't open translation file.";
-char *LLBVHLoader::ST_NO_XLT_HEADER		= "Can't read translation header.";
-char *LLBVHLoader::ST_NO_XLT_NAME		= "Can't read translation names.";
-char *LLBVHLoader::ST_NO_XLT_IGNORE		= "Can't read translation ignore value.";
-char *LLBVHLoader::ST_NO_XLT_RELATIVE	= "Can't read translation relative value.";
-char *LLBVHLoader::ST_NO_XLT_OUTNAME	= "Can't read translation outname value.";
-char *LLBVHLoader::ST_NO_XLT_MATRIX		= "Can't read translation matrix.";
-char *LLBVHLoader::ST_NO_XLT_MERGECHILD = "Can't get mergechild name.";
-char *LLBVHLoader::ST_NO_XLT_MERGEPARENT = "Can't get mergeparent name.";
-char *LLBVHLoader::ST_NO_XLT_PRIORITY	= "Can't get priority value.";
-char *LLBVHLoader::ST_NO_XLT_LOOP		= "Can't get loop value.";
-char *LLBVHLoader::ST_NO_XLT_EASEIN		= "Can't get easeIn values.";
-char *LLBVHLoader::ST_NO_XLT_EASEOUT	= "Can't get easeOut values.";
-char *LLBVHLoader::ST_NO_XLT_HAND		= "Can't get hand morph value.";
-char *LLBVHLoader::ST_NO_XLT_EMOTE		= "Can't read emote name.";
+const char *LLBVHLoader::ST_OK				= "Ok";
+const char *LLBVHLoader::ST_EOF				= "Premature end of file.";
+const char *LLBVHLoader::ST_NO_CONSTRAINT		= "Can't read constraint definition.";
+const char *LLBVHLoader::ST_NO_FILE			= "Can't open BVH file.";
+const char *LLBVHLoader::ST_NO_HIER			= "Invalid HIERARCHY header.";
+const char *LLBVHLoader::ST_NO_JOINT			= "Can't find ROOT or JOINT.";
+const char *LLBVHLoader::ST_NO_NAME			= "Can't get JOINT name.";
+const char *LLBVHLoader::ST_NO_OFFSET			= "Can't find OFFSET.";
+const char *LLBVHLoader::ST_NO_CHANNELS		= "Can't find CHANNELS.";
+const char *LLBVHLoader::ST_NO_ROTATION		= "Can't get rotation order.";
+const char *LLBVHLoader::ST_NO_AXIS			= "Can't get rotation axis.";
+const char *LLBVHLoader::ST_NO_MOTION			= "Can't find MOTION.";
+const char *LLBVHLoader::ST_NO_FRAMES			= "Can't get number of frames.";
+const char *LLBVHLoader::ST_NO_FRAME_TIME		= "Can't get frame time.";
+const char *LLBVHLoader::ST_NO_POS			= "Can't get position values.";
+const char *LLBVHLoader::ST_NO_ROT			= "Can't get rotation values.";
+const char *LLBVHLoader::ST_NO_XLT_FILE		= "Can't open translation file.";
+const char *LLBVHLoader::ST_NO_XLT_HEADER		= "Can't read translation header.";
+const char *LLBVHLoader::ST_NO_XLT_NAME		= "Can't read translation names.";
+const char *LLBVHLoader::ST_NO_XLT_IGNORE		= "Can't read translation ignore value.";
+const char *LLBVHLoader::ST_NO_XLT_RELATIVE	= "Can't read translation relative value.";
+const char *LLBVHLoader::ST_NO_XLT_OUTNAME	= "Can't read translation outname value.";
+const char *LLBVHLoader::ST_NO_XLT_MATRIX		= "Can't read translation matrix.";
+const char *LLBVHLoader::ST_NO_XLT_MERGECHILD = "Can't get mergechild name.";
+const char *LLBVHLoader::ST_NO_XLT_MERGEPARENT = "Can't get mergeparent name.";
+const char *LLBVHLoader::ST_NO_XLT_PRIORITY	= "Can't get priority value.";
+const char *LLBVHLoader::ST_NO_XLT_LOOP		= "Can't get loop value.";
+const char *LLBVHLoader::ST_NO_XLT_EASEIN		= "Can't get easeIn values.";
+const char *LLBVHLoader::ST_NO_XLT_EASEOUT	= "Can't get easeOut values.";
+const char *LLBVHLoader::ST_NO_XLT_HAND		= "Can't get hand morph value.";
+const char *LLBVHLoader::ST_NO_XLT_EMOTE		= "Can't read emote name.";
 
 //------------------------------------------------------------------------
 // find_next_whitespace()
diff --git a/indra/llcharacter/llbvhloader.h b/indra/llcharacter/llbvhloader.h
index 9f69cff7c7..dcd349f828 100644
--- a/indra/llcharacter/llbvhloader.h
+++ b/indra/llcharacter/llbvhloader.h
@@ -203,38 +203,38 @@ public:
 	~LLBVHLoader();
 	
 	// Status Codes
-	typedef char *Status;
-	static char *ST_OK;
-	static char *ST_EOF;
-	static char *ST_NO_CONSTRAINT;
-	static char *ST_NO_FILE;
-	static char *ST_NO_HIER;
-	static char *ST_NO_JOINT;
-	static char *ST_NO_NAME;
-	static char *ST_NO_OFFSET;
-	static char *ST_NO_CHANNELS;
-	static char *ST_NO_ROTATION;
-	static char *ST_NO_AXIS;
-	static char *ST_NO_MOTION;
-	static char *ST_NO_FRAMES;
-	static char *ST_NO_FRAME_TIME;
-	static char *ST_NO_POS;
-	static char *ST_NO_ROT;
-	static char *ST_NO_XLT_FILE;
-	static char *ST_NO_XLT_HEADER;
-	static char *ST_NO_XLT_NAME;
-	static char *ST_NO_XLT_IGNORE;
-	static char *ST_NO_XLT_RELATIVE;
-	static char *ST_NO_XLT_OUTNAME;
-	static char *ST_NO_XLT_MATRIX;
-	static char *ST_NO_XLT_MERGECHILD;
-	static char *ST_NO_XLT_MERGEPARENT;
-	static char *ST_NO_XLT_PRIORITY;
-	static char *ST_NO_XLT_LOOP;
-	static char *ST_NO_XLT_EASEIN;
-	static char *ST_NO_XLT_EASEOUT;
-	static char *ST_NO_XLT_HAND;
-	static char *ST_NO_XLT_EMOTE;
+	typedef const char *Status;
+	static const char *ST_OK;
+	static const char *ST_EOF;
+	static const char *ST_NO_CONSTRAINT;
+	static const char *ST_NO_FILE;
+	static const char *ST_NO_HIER;
+	static const char *ST_NO_JOINT;
+	static const char *ST_NO_NAME;
+	static const char *ST_NO_OFFSET;
+	static const char *ST_NO_CHANNELS;
+	static const char *ST_NO_ROTATION;
+	static const char *ST_NO_AXIS;
+	static const char *ST_NO_MOTION;
+	static const char *ST_NO_FRAMES;
+	static const char *ST_NO_FRAME_TIME;
+	static const char *ST_NO_POS;
+	static const char *ST_NO_ROT;
+	static const char *ST_NO_XLT_FILE;
+	static const char *ST_NO_XLT_HEADER;
+	static const char *ST_NO_XLT_NAME;
+	static const char *ST_NO_XLT_IGNORE;
+	static const char *ST_NO_XLT_RELATIVE;
+	static const char *ST_NO_XLT_OUTNAME;
+	static const char *ST_NO_XLT_MATRIX;
+	static const char *ST_NO_XLT_MERGECHILD;
+	static const char *ST_NO_XLT_MERGEPARENT;
+	static const char *ST_NO_XLT_PRIORITY;
+	static const char *ST_NO_XLT_LOOP;
+	static const char *ST_NO_XLT_EASEIN;
+	static const char *ST_NO_XLT_EASEOUT;
+	static const char *ST_NO_XLT_HAND;
+	static const char *ST_NO_XLT_EMOTE;
 
 	// Loads the specified translation table.
 	Status loadTranslationTable(const char *fileName);
diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h
index 13825dde30..7669920339 100644
--- a/indra/llcharacter/llmotion.h
+++ b/indra/llcharacter/llmotion.h
@@ -49,13 +49,13 @@ class LLCharacter;
 class LLMotion
 {
 public:
-	typedef enum LLMotionBlendType
+	enum LLMotionBlendType
 	{
 		NORMAL_BLEND,
 		ADDITIVE_BLEND
 	};
 
-	typedef enum LLMotionInitStatus
+	enum LLMotionInitStatus
 	{
 		STATUS_FAILURE,
 		STATUS_SUCCESS,