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

1 files changed, 31 insertions, 31 deletions

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()