From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Mon, 2 Jun 2008 21:14:31 +0000 Subject: 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 --- indra/llcharacter/llbvhloader.h | 64 ++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'indra/llcharacter/llbvhloader.h') 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); -- cgit v1.2.3