aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llcharacter
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/llcharacter/CMakeLists.txt76
-rw-r--r--linden/indra/llcharacter/files.lst21
-rw-r--r--linden/indra/llcharacter/llanimationstates.cpp6
-rw-r--r--linden/indra/llcharacter/llanimationstates.h2
-rw-r--r--linden/indra/llcharacter/llbvhloader.cpp114
-rw-r--r--linden/indra/llcharacter/llbvhloader.h64
-rw-r--r--linden/indra/llcharacter/llcharacter.cpp16
-rw-r--r--linden/indra/llcharacter/llcharacter.vcproj296
-rw-r--r--linden/indra/llcharacter/llcharacter_vc8.vcproj419
-rw-r--r--linden/indra/llcharacter/llcharacter_vc9.vcproj420
-rw-r--r--linden/indra/llcharacter/llgesture.cpp18
-rw-r--r--linden/indra/llcharacter/llgesture.h2
-rw-r--r--linden/indra/llcharacter/llhandmotion.cpp8
-rw-r--r--linden/indra/llcharacter/llhandmotion.h4
-rw-r--r--linden/indra/llcharacter/llkeyframemotion.cpp33
-rw-r--r--linden/indra/llcharacter/llkeyframemotion.h11
-rw-r--r--linden/indra/llcharacter/llkeyframemotionparam.cpp8
-rw-r--r--linden/indra/llcharacter/llkeyframewalkmotion.cpp14
-rw-r--r--linden/indra/llcharacter/llmotion.h4
-rw-r--r--linden/indra/llcharacter/llmotioncontroller.h2
-rw-r--r--linden/indra/llcharacter/llmultigesture.cpp10
-rw-r--r--linden/indra/llcharacter/llpose.cpp2
-rw-r--r--linden/indra/llcharacter/llstatemachine.cpp2
-rw-r--r--linden/indra/llcharacter/llstatemachine.h2
-rw-r--r--linden/indra/llcharacter/llvisualparam.cpp4
-rw-r--r--linden/indra/llcharacter/llvisualparam.h24
26 files changed, 265 insertions, 1317 deletions
diff --git a/linden/indra/llcharacter/CMakeLists.txt b/linden/indra/llcharacter/CMakeLists.txt
new file mode 100644
index 0000000..6301062
--- /dev/null
+++ b/linden/indra/llcharacter/CMakeLists.txt
@@ -0,0 +1,76 @@
1# -*- cmake -*-
2
3project(llcharacter)
4
5include(00-Common)
6include(LLCommon)
7include(LLMath)
8include(LLMessage)
9include(LLVFS)
10include(LLXML)
11
12include_directories(
13 ${LLCOMMON_INCLUDE_DIRS}
14 ${LLMATH_INCLUDE_DIRS}
15 ${LLMESSAGE_INCLUDE_DIRS}
16 ${LLVFS_INCLUDE_DIRS}
17 ${LLXML_INCLUDE_DIRS}
18 )
19
20set(llcharacter_SOURCE_FILES
21 llanimationstates.cpp
22 llbvhloader.cpp
23 llcharacter.cpp
24 lleditingmotion.cpp
25 llgesture.cpp
26 llhandmotion.cpp
27 llheadrotmotion.cpp
28 lljoint.cpp
29 lljointsolverrp3.cpp
30 llkeyframefallmotion.cpp
31 llkeyframemotion.cpp
32 llkeyframemotionparam.cpp
33 llkeyframestandmotion.cpp
34 llkeyframewalkmotion.cpp
35 llmotioncontroller.cpp
36 llmotion.cpp
37 llmultigesture.cpp
38 llpose.cpp
39 llstatemachine.cpp
40 lltargetingmotion.cpp
41 llvisualparam.cpp
42 )
43
44set(llcharacter_HEADER_FILES
45 CMakeLists.txt
46
47 llanimationstates.h
48 llbvhloader.h
49 llcharacter.h
50 lleditingmotion.h
51 llgesture.h
52 llhandmotion.h
53 llheadrotmotion.h
54 lljoint.h
55 lljointsolverrp3.h
56 lljointstate.h
57 llkeyframefallmotion.h
58 llkeyframemotion.h
59 llkeyframemotionparam.h
60 llkeyframestandmotion.h
61 llkeyframewalkmotion.h
62 llmotion.h
63 llmotioncontroller.h
64 llmultigesture.h
65 llpose.h
66 llstatemachine.h
67 lltargetingmotion.h
68 llvisualparam.h
69 )
70
71set_source_files_properties(${llcharacter_HEADER_FILES}
72 PROPERTIES HEADER_FILE_ONLY TRUE)
73
74list(APPEND llcharacter_SOURCE_FILES ${llcharacter_HEADER_FILES})
75
76add_library (llcharacter ${llcharacter_SOURCE_FILES})
diff --git a/linden/indra/llcharacter/files.lst b/linden/indra/llcharacter/files.lst
deleted file mode 100644
index 3b7aba2..0000000
--- a/linden/indra/llcharacter/files.lst
+++ /dev/null
@@ -1,21 +0,0 @@
1llcharacter/llanimationstates.cpp
2llcharacter/llbvhloader.cpp
3llcharacter/llcharacter.cpp
4llcharacter/lleditingmotion.cpp
5llcharacter/llgesture.cpp
6llcharacter/llhandmotion.cpp
7llcharacter/llheadrotmotion.cpp
8llcharacter/lljoint.cpp
9llcharacter/lljointsolverrp3.cpp
10llcharacter/llkeyframefallmotion.cpp
11llcharacter/llkeyframemotion.cpp
12llcharacter/llkeyframemotionparam.cpp
13llcharacter/llkeyframestandmotion.cpp
14llcharacter/llkeyframewalkmotion.cpp
15llcharacter/llmotioncontroller.cpp
16llcharacter/llmotion.cpp
17llcharacter/llmultigesture.cpp
18llcharacter/llpose.cpp
19llcharacter/llstatemachine.cpp
20llcharacter/lltargetingmotion.cpp
21llcharacter/llvisualparam.cpp
diff --git a/linden/indra/llcharacter/llanimationstates.cpp b/linden/indra/llcharacter/llanimationstates.cpp
index 2b13b0a..fdeffc5 100644
--- a/linden/indra/llcharacter/llanimationstates.cpp
+++ b/linden/indra/llcharacter/llanimationstates.cpp
@@ -228,10 +228,10 @@ const char *LLAnimationLibrary::animStateToString( const LLUUID& state )
228//----------------------------------------------------------------------------- 228//-----------------------------------------------------------------------------
229// Return the animation state for a given name 229// Return the animation state for a given name
230//----------------------------------------------------------------------------- 230//-----------------------------------------------------------------------------
231LLUUID LLAnimationLibrary::stringToAnimState( const char *name, BOOL allow_ids ) 231LLUUID LLAnimationLibrary::stringToAnimState( const std::string& name, BOOL allow_ids )
232{ 232{
233 LLString lower_case_name(name); 233 std::string lower_case_name(name);
234 LLString::toLower(lower_case_name); 234 LLStringUtil::toLower(lower_case_name);
235 235
236 char *true_name = mAnimStringTable.checkString(lower_case_name.c_str()); 236 char *true_name = mAnimStringTable.checkString(lower_case_name.c_str());
237 237
diff --git a/linden/indra/llcharacter/llanimationstates.h b/linden/indra/llcharacter/llanimationstates.h
index dd269de..aa9e517 100644
--- a/linden/indra/llcharacter/llanimationstates.h
+++ b/linden/indra/llcharacter/llanimationstates.h
@@ -222,7 +222,7 @@ public:
222 // Return the animation state for the given name. 222 // Return the animation state for the given name.
223 // Retun NULL if the name is invalid. 223 // Retun NULL if the name is invalid.
224 //----------------------------------------------------------------------------- 224 //-----------------------------------------------------------------------------
225 LLUUID stringToAnimState( const char *name, BOOL allow_ids = TRUE ); 225 LLUUID stringToAnimState( const std::string& name, BOOL allow_ids = TRUE );
226}; 226};
227 227
228struct LLAnimStateEntry 228struct LLAnimStateEntry
diff --git a/linden/indra/llcharacter/llbvhloader.cpp b/linden/indra/llcharacter/llbvhloader.cpp
index e6e49f8..cd1f492 100644
--- a/linden/indra/llcharacter/llbvhloader.cpp
+++ b/linden/indra/llcharacter/llbvhloader.cpp
@@ -59,37 +59,37 @@ char gOutFile[1024]; /* Flawfinder: ignore */
59//------------------------------------------------------------------------ 59//------------------------------------------------------------------------
60// Status Codes 60// Status Codes
61//------------------------------------------------------------------------ 61//------------------------------------------------------------------------
62char *LLBVHLoader::ST_OK = "Ok"; 62const char *LLBVHLoader::ST_OK = "Ok";
63char *LLBVHLoader::ST_EOF = "Premature end of file."; 63const char *LLBVHLoader::ST_EOF = "Premature end of file.";
64char *LLBVHLoader::ST_NO_CONSTRAINT = "Can't read constraint definition."; 64const char *LLBVHLoader::ST_NO_CONSTRAINT = "Can't read constraint definition.";
65char *LLBVHLoader::ST_NO_FILE = "Can't open BVH file."; 65const char *LLBVHLoader::ST_NO_FILE = "Can't open BVH file.";
66char *LLBVHLoader::ST_NO_HIER = "Invalid HIERARCHY header."; 66const char *LLBVHLoader::ST_NO_HIER = "Invalid HIERARCHY header.";
67char *LLBVHLoader::ST_NO_JOINT = "Can't find ROOT or JOINT."; 67const char *LLBVHLoader::ST_NO_JOINT = "Can't find ROOT or JOINT.";
68char *LLBVHLoader::ST_NO_NAME = "Can't get JOINT name."; 68const char *LLBVHLoader::ST_NO_NAME = "Can't get JOINT name.";
69char *LLBVHLoader::ST_NO_OFFSET = "Can't find OFFSET."; 69const char *LLBVHLoader::ST_NO_OFFSET = "Can't find OFFSET.";
70char *LLBVHLoader::ST_NO_CHANNELS = "Can't find CHANNELS."; 70const char *LLBVHLoader::ST_NO_CHANNELS = "Can't find CHANNELS.";
71char *LLBVHLoader::ST_NO_ROTATION = "Can't get rotation order."; 71const char *LLBVHLoader::ST_NO_ROTATION = "Can't get rotation order.";
72char *LLBVHLoader::ST_NO_AXIS = "Can't get rotation axis."; 72const char *LLBVHLoader::ST_NO_AXIS = "Can't get rotation axis.";
73char *LLBVHLoader::ST_NO_MOTION = "Can't find MOTION."; 73const char *LLBVHLoader::ST_NO_MOTION = "Can't find MOTION.";
74char *LLBVHLoader::ST_NO_FRAMES = "Can't get number of frames."; 74const char *LLBVHLoader::ST_NO_FRAMES = "Can't get number of frames.";
75char *LLBVHLoader::ST_NO_FRAME_TIME = "Can't get frame time."; 75const char *LLBVHLoader::ST_NO_FRAME_TIME = "Can't get frame time.";
76char *LLBVHLoader::ST_NO_POS = "Can't get position values."; 76const char *LLBVHLoader::ST_NO_POS = "Can't get position values.";
77char *LLBVHLoader::ST_NO_ROT = "Can't get rotation values."; 77const char *LLBVHLoader::ST_NO_ROT = "Can't get rotation values.";
78char *LLBVHLoader::ST_NO_XLT_FILE = "Can't open translation file."; 78const char *LLBVHLoader::ST_NO_XLT_FILE = "Can't open translation file.";
79char *LLBVHLoader::ST_NO_XLT_HEADER = "Can't read translation header."; 79const char *LLBVHLoader::ST_NO_XLT_HEADER = "Can't read translation header.";
80char *LLBVHLoader::ST_NO_XLT_NAME = "Can't read translation names."; 80const char *LLBVHLoader::ST_NO_XLT_NAME = "Can't read translation names.";
81char *LLBVHLoader::ST_NO_XLT_IGNORE = "Can't read translation ignore value."; 81const char *LLBVHLoader::ST_NO_XLT_IGNORE = "Can't read translation ignore value.";
82char *LLBVHLoader::ST_NO_XLT_RELATIVE = "Can't read translation relative value."; 82const char *LLBVHLoader::ST_NO_XLT_RELATIVE = "Can't read translation relative value.";
83char *LLBVHLoader::ST_NO_XLT_OUTNAME = "Can't read translation outname value."; 83const char *LLBVHLoader::ST_NO_XLT_OUTNAME = "Can't read translation outname value.";
84char *LLBVHLoader::ST_NO_XLT_MATRIX = "Can't read translation matrix."; 84const char *LLBVHLoader::ST_NO_XLT_MATRIX = "Can't read translation matrix.";
85char *LLBVHLoader::ST_NO_XLT_MERGECHILD = "Can't get mergechild name."; 85const char *LLBVHLoader::ST_NO_XLT_MERGECHILD = "Can't get mergechild name.";
86char *LLBVHLoader::ST_NO_XLT_MERGEPARENT = "Can't get mergeparent name."; 86const char *LLBVHLoader::ST_NO_XLT_MERGEPARENT = "Can't get mergeparent name.";
87char *LLBVHLoader::ST_NO_XLT_PRIORITY = "Can't get priority value."; 87const char *LLBVHLoader::ST_NO_XLT_PRIORITY = "Can't get priority value.";
88char *LLBVHLoader::ST_NO_XLT_LOOP = "Can't get loop value."; 88const char *LLBVHLoader::ST_NO_XLT_LOOP = "Can't get loop value.";
89char *LLBVHLoader::ST_NO_XLT_EASEIN = "Can't get easeIn values."; 89const char *LLBVHLoader::ST_NO_XLT_EASEIN = "Can't get easeIn values.";
90char *LLBVHLoader::ST_NO_XLT_EASEOUT = "Can't get easeOut values."; 90const char *LLBVHLoader::ST_NO_XLT_EASEOUT = "Can't get easeOut values.";
91char *LLBVHLoader::ST_NO_XLT_HAND = "Can't get hand morph value."; 91const char *LLBVHLoader::ST_NO_XLT_HAND = "Can't get hand morph value.";
92char *LLBVHLoader::ST_NO_XLT_EMOTE = "Can't read emote name."; 92const char *LLBVHLoader::ST_NO_XLT_EMOTE = "Can't read emote name.";
93 93
94//------------------------------------------------------------------------ 94//------------------------------------------------------------------------
95// find_next_whitespace() 95// find_next_whitespace()
@@ -175,11 +175,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
175 //-------------------------------------------------------------------- 175 //--------------------------------------------------------------------
176 // open file 176 // open file
177 //-------------------------------------------------------------------- 177 //--------------------------------------------------------------------
178 char path[LL_MAX_PATH]; /* Flawfinder: ignore */ 178 std::string path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,fileName);
179
180 snprintf( path, sizeof(path), "%s", /* Flawfinder: ignore */
181 gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,fileName).c_str());
182
183 179
184 apr_file_t *fp = ll_apr_file_open(path, LL_APR_R); 180 apr_file_t *fp = ll_apr_file_open(path, LL_APR_R);
185 if (!fp) 181 if (!fp)
@@ -243,7 +239,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
243 //---------------------------------------------------------------- 239 //----------------------------------------------------------------
244 // check for optional emote 240 // check for optional emote
245 //---------------------------------------------------------------- 241 //----------------------------------------------------------------
246 if (loadingGlobals && LLString::compareInsensitive(token, "emote")==0) 242 if (loadingGlobals && LLStringUtil::compareInsensitive(token, "emote")==0)
247 { 243 {
248 char emote_str[1024]; /* Flawfinder: ignore */ 244 char emote_str[1024]; /* Flawfinder: ignore */
249 if ( sscanf(mLine, " %*s = %1023s", emote_str) != 1 ) /* Flawfinder: ignore */ 245 if ( sscanf(mLine, " %*s = %1023s", emote_str) != 1 ) /* Flawfinder: ignore */
@@ -258,7 +254,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
258 //---------------------------------------------------------------- 254 //----------------------------------------------------------------
259 // check for global priority setting 255 // check for global priority setting
260 //---------------------------------------------------------------- 256 //----------------------------------------------------------------
261 if (loadingGlobals && LLString::compareInsensitive(token, "priority")==0) 257 if (loadingGlobals && LLStringUtil::compareInsensitive(token, "priority")==0)
262 { 258 {
263 S32 priority; 259 S32 priority;
264 if ( sscanf(mLine, " %*s = %d", &priority) != 1 ) 260 if ( sscanf(mLine, " %*s = %d", &priority) != 1 )
@@ -272,7 +268,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
272 //---------------------------------------------------------------- 268 //----------------------------------------------------------------
273 // check for global loop setting 269 // check for global loop setting
274 //---------------------------------------------------------------- 270 //----------------------------------------------------------------
275 if (loadingGlobals && LLString::compareInsensitive(token, "loop")==0) 271 if (loadingGlobals && LLStringUtil::compareInsensitive(token, "loop")==0)
276 { 272 {
277 char trueFalse[128]; /* Flawfinder: ignore */ 273 char trueFalse[128]; /* Flawfinder: ignore */
278 trueFalse[0] = '\0'; 274 trueFalse[0] = '\0';
@@ -286,7 +282,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
286 } 282 }
287 else if ( sscanf(mLine, " %*s = %127s", trueFalse) == 1 ) /* Flawfinder: ignore */ 283 else if ( sscanf(mLine, " %*s = %127s", trueFalse) == 1 ) /* Flawfinder: ignore */
288 { 284 {
289 mLoop = (LLString::compareInsensitive(trueFalse, "true")==0); 285 mLoop = (LLStringUtil::compareInsensitive(trueFalse, "true")==0);
290 } 286 }
291 else 287 else
292 { 288 {
@@ -302,7 +298,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
302 //---------------------------------------------------------------- 298 //----------------------------------------------------------------
303 // check for global easeIn setting 299 // check for global easeIn setting
304 //---------------------------------------------------------------- 300 //----------------------------------------------------------------
305 if (loadingGlobals && LLString::compareInsensitive(token, "easein")==0) 301 if (loadingGlobals && LLStringUtil::compareInsensitive(token, "easein")==0)
306 { 302 {
307 F32 duration; 303 F32 duration;
308 char type[128]; /* Flawfinder: ignore */ 304 char type[128]; /* Flawfinder: ignore */
@@ -316,7 +312,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
316 //---------------------------------------------------------------- 312 //----------------------------------------------------------------
317 // check for global easeOut setting 313 // check for global easeOut setting
318 //---------------------------------------------------------------- 314 //----------------------------------------------------------------
319 if (loadingGlobals && LLString::compareInsensitive(token, "easeout")==0) 315 if (loadingGlobals && LLStringUtil::compareInsensitive(token, "easeout")==0)
320 { 316 {
321 F32 duration; 317 F32 duration;
322 char type[128]; /* Flawfinder: ignore */ 318 char type[128]; /* Flawfinder: ignore */
@@ -330,7 +326,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
330 //---------------------------------------------------------------- 326 //----------------------------------------------------------------
331 // check for global handMorph setting 327 // check for global handMorph setting
332 //---------------------------------------------------------------- 328 //----------------------------------------------------------------
333 if (loadingGlobals && LLString::compareInsensitive(token, "hand")==0) 329 if (loadingGlobals && LLStringUtil::compareInsensitive(token, "hand")==0)
334 { 330 {
335 S32 handMorph; 331 S32 handMorph;
336 if (sscanf(mLine, " %*s = %d", &handMorph) != 1) 332 if (sscanf(mLine, " %*s = %d", &handMorph) != 1)
@@ -340,7 +336,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
340 continue; 336 continue;
341 } 337 }
342 338
343 if (loadingGlobals && LLString::compareInsensitive(token, "constraint")==0) 339 if (loadingGlobals && LLStringUtil::compareInsensitive(token, "constraint")==0)
344 { 340 {
345 Constraint constraint; 341 Constraint constraint;
346 342
@@ -400,7 +396,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
400 continue; 396 continue;
401 } 397 }
402 398
403 if (loadingGlobals && LLString::compareInsensitive(token, "planar_constraint")==0) 399 if (loadingGlobals && LLStringUtil::compareInsensitive(token, "planar_constraint")==0)
404 { 400 {
405 Constraint constraint; 401 Constraint constraint;
406 402
@@ -470,20 +466,20 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
470 //---------------------------------------------------------------- 466 //----------------------------------------------------------------
471 // check for ignore flag 467 // check for ignore flag
472 //---------------------------------------------------------------- 468 //----------------------------------------------------------------
473 if ( LLString::compareInsensitive(token, "ignore")==0 ) 469 if ( LLStringUtil::compareInsensitive(token, "ignore")==0 )
474 { 470 {
475 char trueFalse[128]; /* Flawfinder: ignore */ 471 char trueFalse[128]; /* Flawfinder: ignore */
476 if ( sscanf(mLine, " %*s = %127s", trueFalse) != 1 ) /* Flawfinder: ignore */ 472 if ( sscanf(mLine, " %*s = %127s", trueFalse) != 1 ) /* Flawfinder: ignore */
477 return ST_NO_XLT_IGNORE; 473 return ST_NO_XLT_IGNORE;
478 474
479 trans->mIgnore = (LLString::compareInsensitive(trueFalse, "true")==0); 475 trans->mIgnore = (LLStringUtil::compareInsensitive(trueFalse, "true")==0);
480 continue; 476 continue;
481 } 477 }
482 478
483 //---------------------------------------------------------------- 479 //----------------------------------------------------------------
484 // check for relativepos flag 480 // check for relativepos flag
485 //---------------------------------------------------------------- 481 //----------------------------------------------------------------
486 if ( LLString::compareInsensitive(token, "relativepos")==0 ) 482 if ( LLStringUtil::compareInsensitive(token, "relativepos")==0 )
487 { 483 {
488 F32 x, y, z; 484 F32 x, y, z;
489 char relpos[128]; /* Flawfinder: ignore */ 485 char relpos[128]; /* Flawfinder: ignore */
@@ -493,7 +489,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
493 } 489 }
494 else if ( sscanf(mLine, " %*s = %127s", relpos) == 1 ) /* Flawfinder: ignore */ 490 else if ( sscanf(mLine, " %*s = %127s", relpos) == 1 ) /* Flawfinder: ignore */
495 { 491 {
496 if ( LLString::compareInsensitive(relpos, "firstkey")==0 ) 492 if ( LLStringUtil::compareInsensitive(relpos, "firstkey")==0 )
497 { 493 {
498 trans->mRelativePositionKey = TRUE; 494 trans->mRelativePositionKey = TRUE;
499 } 495 }
@@ -513,13 +509,13 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
513 //---------------------------------------------------------------- 509 //----------------------------------------------------------------
514 // check for relativerot flag 510 // check for relativerot flag
515 //---------------------------------------------------------------- 511 //----------------------------------------------------------------
516 if ( LLString::compareInsensitive(token, "relativerot")==0 ) 512 if ( LLStringUtil::compareInsensitive(token, "relativerot")==0 )
517 { 513 {
518 //F32 x, y, z; 514 //F32 x, y, z;
519 char relpos[128]; /* Flawfinder: ignore */ 515 char relpos[128]; /* Flawfinder: ignore */
520 if ( sscanf(mLine, " %*s = %127s", relpos) == 1 ) /* Flawfinder: ignore */ 516 if ( sscanf(mLine, " %*s = %127s", relpos) == 1 ) /* Flawfinder: ignore */
521 { 517 {
522 if ( LLString::compareInsensitive(relpos, "firstkey")==0 ) 518 if ( LLStringUtil::compareInsensitive(relpos, "firstkey")==0 )
523 { 519 {
524 trans->mRelativeRotationKey = TRUE; 520 trans->mRelativeRotationKey = TRUE;
525 } 521 }
@@ -539,7 +535,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
539 //---------------------------------------------------------------- 535 //----------------------------------------------------------------
540 // check for outname value 536 // check for outname value
541 //---------------------------------------------------------------- 537 //----------------------------------------------------------------
542 if ( LLString::compareInsensitive(token, "outname")==0 ) 538 if ( LLStringUtil::compareInsensitive(token, "outname")==0 )
543 { 539 {
544 char outName[128]; /* Flawfinder: ignore */ 540 char outName[128]; /* Flawfinder: ignore */
545 if ( sscanf(mLine, " %*s = %127s", outName) != 1 ) /* Flawfinder: ignore */ 541 if ( sscanf(mLine, " %*s = %127s", outName) != 1 ) /* Flawfinder: ignore */
@@ -552,7 +548,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
552 //---------------------------------------------------------------- 548 //----------------------------------------------------------------
553 // check for frame matrix value 549 // check for frame matrix value
554 //---------------------------------------------------------------- 550 //----------------------------------------------------------------
555 if ( LLString::compareInsensitive(token, "frame")==0 ) 551 if ( LLStringUtil::compareInsensitive(token, "frame")==0 )
556 { 552 {
557 LLMatrix3 fm; 553 LLMatrix3 fm;
558 if ( sscanf(mLine, " %*s = %f %f %f, %f %f %f, %f %f %f", 554 if ( sscanf(mLine, " %*s = %f %f %f, %f %f %f, %f %f %f",
@@ -568,7 +564,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
568 //---------------------------------------------------------------- 564 //----------------------------------------------------------------
569 // check for offset matrix value 565 // check for offset matrix value
570 //---------------------------------------------------------------- 566 //----------------------------------------------------------------
571 if ( LLString::compareInsensitive(token, "offset")==0 ) 567 if ( LLStringUtil::compareInsensitive(token, "offset")==0 )
572 { 568 {
573 LLMatrix3 om; 569 LLMatrix3 om;
574 if ( sscanf(mLine, " %*s = %f %f %f, %f %f %f, %f %f %f", 570 if ( sscanf(mLine, " %*s = %f %f %f, %f %f %f, %f %f %f",
@@ -584,7 +580,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
584 //---------------------------------------------------------------- 580 //----------------------------------------------------------------
585 // check for mergeparent value 581 // check for mergeparent value
586 //---------------------------------------------------------------- 582 //----------------------------------------------------------------
587 if ( LLString::compareInsensitive(token, "mergeparent")==0 ) 583 if ( LLStringUtil::compareInsensitive(token, "mergeparent")==0 )
588 { 584 {
589 char mergeParentName[128]; /* Flawfinder: ignore */ 585 char mergeParentName[128]; /* Flawfinder: ignore */
590 if ( sscanf(mLine, " %*s = %127s", mergeParentName) != 1 ) /* Flawfinder: ignore */ 586 if ( sscanf(mLine, " %*s = %127s", mergeParentName) != 1 ) /* Flawfinder: ignore */
@@ -597,7 +593,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
597 //---------------------------------------------------------------- 593 //----------------------------------------------------------------
598 // check for mergechild value 594 // check for mergechild value
599 //---------------------------------------------------------------- 595 //----------------------------------------------------------------
600 if ( LLString::compareInsensitive(token, "mergechild")==0 ) 596 if ( LLStringUtil::compareInsensitive(token, "mergechild")==0 )
601 { 597 {
602 char mergeChildName[128]; /* Flawfinder: ignore */ 598 char mergeChildName[128]; /* Flawfinder: ignore */
603 if ( sscanf(mLine, " %*s = %127s", mergeChildName) != 1 ) /* Flawfinder: ignore */ 599 if ( sscanf(mLine, " %*s = %127s", mergeChildName) != 1 ) /* Flawfinder: ignore */
@@ -610,7 +606,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
610 //---------------------------------------------------------------- 606 //----------------------------------------------------------------
611 // check for per-joint priority 607 // check for per-joint priority
612 //---------------------------------------------------------------- 608 //----------------------------------------------------------------
613 if ( LLString::compareInsensitive(token, "priority")==0 ) 609 if ( LLStringUtil::compareInsensitive(token, "priority")==0 )
614 { 610 {
615 S32 priority; 611 S32 priority;
616 if ( sscanf(mLine, " %*s = %d", &priority) != 1 ) 612 if ( sscanf(mLine, " %*s = %d", &priority) != 1 )
@@ -1304,7 +1300,7 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
1304 dp.packU16(KEYFRAME_MOTION_SUBVERSION, "sub_version"); 1300 dp.packU16(KEYFRAME_MOTION_SUBVERSION, "sub_version");
1305 dp.packS32(mPriority, "base_priority"); 1301 dp.packS32(mPriority, "base_priority");
1306 dp.packF32(mDuration, "duration"); 1302 dp.packF32(mDuration, "duration");
1307 dp.packString(mEmoteName.c_str(), "emote_name"); 1303 dp.packString(mEmoteName, "emote_name");
1308 dp.packF32(mLoopInPoint, "loop_in_point"); 1304 dp.packF32(mLoopInPoint, "loop_in_point");
1309 dp.packF32(mLoopOutPoint, "loop_out_point"); 1305 dp.packF32(mLoopOutPoint, "loop_out_point");
1310 dp.packS32(mLoop, "loop"); 1306 dp.packS32(mLoop, "loop");
@@ -1325,7 +1321,7 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp)
1325 LLQuaternion first_frame_rot; 1321 LLQuaternion first_frame_rot;
1326 LLQuaternion fixup_rot; 1322 LLQuaternion fixup_rot;
1327 1323
1328 dp.packString(joint->mOutName.c_str(), "joint_name"); 1324 dp.packString(joint->mOutName, "joint_name");
1329 dp.packS32(joint->mPriority, "joint_priority"); 1325 dp.packS32(joint->mPriority, "joint_priority");
1330 1326
1331 // compute coordinate frame rotation 1327 // compute coordinate frame rotation
diff --git a/linden/indra/llcharacter/llbvhloader.h b/linden/indra/llcharacter/llbvhloader.h
index 3935ebe..f360fc8 100644
--- a/linden/indra/llcharacter/llbvhloader.h
+++ b/linden/indra/llcharacter/llbvhloader.h
@@ -203,38 +203,38 @@ public:
203 ~LLBVHLoader(); 203 ~LLBVHLoader();
204 204
205 // Status Codes 205 // Status Codes
206 typedef char *Status; 206 typedef const char *Status;
207 static char *ST_OK; 207 static const char *ST_OK;
208 static char *ST_EOF; 208 static const char *ST_EOF;
209 static char *ST_NO_CONSTRAINT; 209 static const char *ST_NO_CONSTRAINT;
210 static char *ST_NO_FILE; 210 static const char *ST_NO_FILE;
211 static char *ST_NO_HIER; 211 static const char *ST_NO_HIER;
212 static char *ST_NO_JOINT; 212 static const char *ST_NO_JOINT;
213 static char *ST_NO_NAME; 213 static const char *ST_NO_NAME;
214 static char *ST_NO_OFFSET; 214 static const char *ST_NO_OFFSET;
215 static char *ST_NO_CHANNELS; 215 static const char *ST_NO_CHANNELS;
216 static char *ST_NO_ROTATION; 216 static const char *ST_NO_ROTATION;
217 static char *ST_NO_AXIS; 217 static const char *ST_NO_AXIS;
218 static char *ST_NO_MOTION; 218 static const char *ST_NO_MOTION;
219 static char *ST_NO_FRAMES; 219 static const char *ST_NO_FRAMES;
220 static char *ST_NO_FRAME_TIME; 220 static const char *ST_NO_FRAME_TIME;
221 static char *ST_NO_POS; 221 static const char *ST_NO_POS;
222 static char *ST_NO_ROT; 222 static const char *ST_NO_ROT;
223 static char *ST_NO_XLT_FILE; 223 static const char *ST_NO_XLT_FILE;
224 static char *ST_NO_XLT_HEADER; 224 static const char *ST_NO_XLT_HEADER;
225 static char *ST_NO_XLT_NAME; 225 static const char *ST_NO_XLT_NAME;
226 static char *ST_NO_XLT_IGNORE; 226 static const char *ST_NO_XLT_IGNORE;
227 static char *ST_NO_XLT_RELATIVE; 227 static const char *ST_NO_XLT_RELATIVE;
228 static char *ST_NO_XLT_OUTNAME; 228 static const char *ST_NO_XLT_OUTNAME;
229 static char *ST_NO_XLT_MATRIX; 229 static const char *ST_NO_XLT_MATRIX;
230 static char *ST_NO_XLT_MERGECHILD; 230 static const char *ST_NO_XLT_MERGECHILD;
231 static char *ST_NO_XLT_MERGEPARENT; 231 static const char *ST_NO_XLT_MERGEPARENT;
232 static char *ST_NO_XLT_PRIORITY; 232 static const char *ST_NO_XLT_PRIORITY;
233 static char *ST_NO_XLT_LOOP; 233 static const char *ST_NO_XLT_LOOP;
234 static char *ST_NO_XLT_EASEIN; 234 static const char *ST_NO_XLT_EASEIN;
235 static char *ST_NO_XLT_EASEOUT; 235 static const char *ST_NO_XLT_EASEOUT;
236 static char *ST_NO_XLT_HAND; 236 static const char *ST_NO_XLT_HAND;
237 static char *ST_NO_XLT_EMOTE; 237 static const char *ST_NO_XLT_EMOTE;
238 238
239 // Loads the specified translation table. 239 // Loads the specified translation table.
240 Status loadTranslationTable(const char *fileName); 240 Status loadTranslationTable(const char *fileName);
diff --git a/linden/indra/llcharacter/llcharacter.cpp b/linden/indra/llcharacter/llcharacter.cpp
index 83487bc..71c5c40 100644
--- a/linden/indra/llcharacter/llcharacter.cpp
+++ b/linden/indra/llcharacter/llcharacter.cpp
@@ -287,8 +287,8 @@ BOOL LLCharacter::setVisualParamWeight(LLVisualParam* which_param, F32 weight, B
287//----------------------------------------------------------------------------- 287//-----------------------------------------------------------------------------
288BOOL LLCharacter::setVisualParamWeight(const char* param_name, F32 weight, BOOL set_by_user) 288BOOL LLCharacter::setVisualParamWeight(const char* param_name, F32 weight, BOOL set_by_user)
289{ 289{
290 LLString tname(param_name); 290 std::string tname(param_name);
291 LLString::toLower(tname); 291 LLStringUtil::toLower(tname);
292 char *tableptr = sVisualParamNames.checkString(tname); 292 char *tableptr = sVisualParamNames.checkString(tname);
293 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr); 293 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr);
294 if (name_iter != mVisualParamNameMap.end()) 294 if (name_iter != mVisualParamNameMap.end())
@@ -338,8 +338,8 @@ F32 LLCharacter::getVisualParamWeight(LLVisualParam *which_param)
338//----------------------------------------------------------------------------- 338//-----------------------------------------------------------------------------
339F32 LLCharacter::getVisualParamWeight(const char* param_name) 339F32 LLCharacter::getVisualParamWeight(const char* param_name)
340{ 340{
341 LLString tname(param_name); 341 std::string tname(param_name);
342 LLString::toLower(tname); 342 LLStringUtil::toLower(tname);
343 char *tableptr = sVisualParamNames.checkString(tname); 343 char *tableptr = sVisualParamNames.checkString(tname);
344 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr); 344 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr);
345 if (name_iter != mVisualParamNameMap.end()) 345 if (name_iter != mVisualParamNameMap.end())
@@ -409,8 +409,8 @@ BOOL LLCharacter::visualParamWeightsAreDefault()
409//----------------------------------------------------------------------------- 409//-----------------------------------------------------------------------------
410LLVisualParam* LLCharacter::getVisualParam(const char *param_name) 410LLVisualParam* LLCharacter::getVisualParam(const char *param_name)
411{ 411{
412 LLString tname(param_name); 412 std::string tname(param_name);
413 LLString::toLower(tname); 413 LLStringUtil::toLower(tname);
414 char *tableptr = sVisualParamNames.checkString(tname); 414 char *tableptr = sVisualParamNames.checkString(tname);
415 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr); 415 VisualParamNameMap_t::iterator name_iter = mVisualParamNameMap.find(tableptr);
416 if (name_iter != mVisualParamNameMap.end()) 416 if (name_iter != mVisualParamNameMap.end())
@@ -467,8 +467,8 @@ void LLCharacter::addVisualParam(LLVisualParam *param)
467 if (param->getInfo()) 467 if (param->getInfo())
468 { 468 {
469 // Add name map 469 // Add name map
470 LLString tname(param->getName()); 470 std::string tname(param->getName());
471 LLString::toLower(tname); 471 LLStringUtil::toLower(tname);
472 char *tableptr = sVisualParamNames.addString(tname); 472 char *tableptr = sVisualParamNames.addString(tname);
473 std::pair<VisualParamNameMap_t::iterator, bool> nameres; 473 std::pair<VisualParamNameMap_t::iterator, bool> nameres;
474 nameres = mVisualParamNameMap.insert(VisualParamNameMap_t::value_type(tableptr, param)); 474 nameres = mVisualParamNameMap.insert(VisualParamNameMap_t::value_type(tableptr, param));
diff --git a/linden/indra/llcharacter/llcharacter.vcproj b/linden/indra/llcharacter/llcharacter.vcproj
deleted file mode 100644
index 82f17ae..0000000
--- a/linden/indra/llcharacter/llcharacter.vcproj
+++ /dev/null
@@ -1,296 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="7.10"
5 Name="llcharacter"
6 ProjectGUID="{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
7 Keyword="Win32Proj">
8 <Platforms>
9 <Platform
10 Name="Win32"/>
11 </Platforms>
12 <Configurations>
13 <Configuration
14 Name="Debug|Win32"
15 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
16 IntermediateDirectory="Debug"
17 ConfigurationType="4"
18 CharacterSet="1">
19 <Tool
20 Name="VCCLCompilerTool"
21 Optimization="0"
22 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
23 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
24 MinimalRebuild="TRUE"
25 BasicRuntimeChecks="3"
26 RuntimeLibrary="1"
27 StructMemberAlignment="4"
28 ForceConformanceInForLoopScope="TRUE"
29 UsePrecompiledHeader="0"
30 WarningLevel="3"
31 WarnAsError="TRUE"
32 Detect64BitPortabilityProblems="FALSE"
33 DebugInformationFormat="4"/>
34 <Tool
35 Name="VCCustomBuildTool"/>
36 <Tool
37 Name="VCLibrarianTool"
38 OutputFile="$(OutDir)/llcharacter.lib"/>
39 <Tool
40 Name="VCMIDLTool"/>
41 <Tool
42 Name="VCPostBuildEventTool"/>
43 <Tool
44 Name="VCPreBuildEventTool"/>
45 <Tool
46 Name="VCPreLinkEventTool"/>
47 <Tool
48 Name="VCResourceCompilerTool"/>
49 <Tool
50 Name="VCWebServiceProxyGeneratorTool"/>
51 <Tool
52 Name="VCXMLDataGeneratorTool"/>
53 <Tool
54 Name="VCManagedWrapperGeneratorTool"/>
55 <Tool
56 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
57 </Configuration>
58 <Configuration
59 Name="Release|Win32"
60 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
61 IntermediateDirectory="Release"
62 ConfigurationType="4"
63 CharacterSet="1">
64 <Tool
65 Name="VCCLCompilerTool"
66 AdditionalOptions="/Oy-"
67 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
68 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
69 RuntimeLibrary="0"
70 StructMemberAlignment="0"
71 ForceConformanceInForLoopScope="TRUE"
72 UsePrecompiledHeader="0"
73 WarningLevel="3"
74 WarnAsError="TRUE"
75 Detect64BitPortabilityProblems="FALSE"
76 DebugInformationFormat="3"/>
77 <Tool
78 Name="VCCustomBuildTool"/>
79 <Tool
80 Name="VCLibrarianTool"
81 OutputFile="$(OutDir)/llcharacter.lib"/>
82 <Tool
83 Name="VCMIDLTool"/>
84 <Tool
85 Name="VCPostBuildEventTool"/>
86 <Tool
87 Name="VCPreBuildEventTool"/>
88 <Tool
89 Name="VCPreLinkEventTool"/>
90 <Tool
91 Name="VCResourceCompilerTool"/>
92 <Tool
93 Name="VCWebServiceProxyGeneratorTool"/>
94 <Tool
95 Name="VCXMLDataGeneratorTool"/>
96 <Tool
97 Name="VCManagedWrapperGeneratorTool"/>
98 <Tool
99 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
100 </Configuration>
101 <Configuration
102 Name="ReleaseNoOpt|Win32"
103 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
104 IntermediateDirectory="$(ConfigurationName)"
105 ConfigurationType="4"
106 CharacterSet="1">
107 <Tool
108 Name="VCCLCompilerTool"
109 AdditionalOptions="/Oy-"
110 Optimization="0"
111 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
112 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
113 RuntimeLibrary="0"
114 StructMemberAlignment="0"
115 ForceConformanceInForLoopScope="TRUE"
116 UsePrecompiledHeader="0"
117 WarningLevel="3"
118 WarnAsError="TRUE"
119 Detect64BitPortabilityProblems="FALSE"
120 DebugInformationFormat="3"/>
121 <Tool
122 Name="VCCustomBuildTool"/>
123 <Tool
124 Name="VCLibrarianTool"
125 OutputFile="$(OutDir)/llcharacter.lib"/>
126 <Tool
127 Name="VCMIDLTool"/>
128 <Tool
129 Name="VCPostBuildEventTool"/>
130 <Tool
131 Name="VCPreBuildEventTool"/>
132 <Tool
133 Name="VCPreLinkEventTool"/>
134 <Tool
135 Name="VCResourceCompilerTool"/>
136 <Tool
137 Name="VCWebServiceProxyGeneratorTool"/>
138 <Tool
139 Name="VCXMLDataGeneratorTool"/>
140 <Tool
141 Name="VCManagedWrapperGeneratorTool"/>
142 <Tool
143 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
144 </Configuration>
145 </Configurations>
146 <References>
147 </References>
148 <Files>
149 <Filter
150 Name="Source Files"
151 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
152 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
153 <File
154 RelativePath=".\llanimationstates.cpp">
155 </File>
156 <File
157 RelativePath=".\llbvhloader.cpp">
158 </File>
159 <File
160 RelativePath=".\llcharacter.cpp">
161 </File>
162 <File
163 RelativePath=".\lleditingmotion.cpp">
164 </File>
165 <File
166 RelativePath=".\llgesture.cpp">
167 </File>
168 <File
169 RelativePath=".\llhandmotion.cpp">
170 </File>
171 <File
172 RelativePath=".\llheadrotmotion.cpp">
173 </File>
174 <File
175 RelativePath=".\lljoint.cpp">
176 </File>
177 <File
178 RelativePath=".\lljointsolverrp3.cpp">
179 </File>
180 <File
181 RelativePath=".\llkeyframefallmotion.cpp">
182 </File>
183 <File
184 RelativePath=".\llkeyframemotion.cpp">
185 </File>
186 <File
187 RelativePath=".\llkeyframemotionparam.cpp">
188 </File>
189 <File
190 RelativePath=".\llkeyframestandmotion.cpp">
191 </File>
192 <File
193 RelativePath=".\llkeyframewalkmotion.cpp">
194 </File>
195 <File
196 RelativePath=".\llmotion.cpp">
197 </File>
198 <File
199 RelativePath=".\llmotioncontroller.cpp">
200 </File>
201 <File
202 RelativePath=".\llmultigesture.cpp">
203 </File>
204 <File
205 RelativePath=".\llpose.cpp">
206 </File>
207 <File
208 RelativePath=".\llstatemachine.cpp">
209 </File>
210 <File
211 RelativePath=".\lltargetingmotion.cpp">
212 </File>
213 <File
214 RelativePath=".\llvisualparam.cpp">
215 </File>
216 </Filter>
217 <Filter
218 Name="Header Files"
219 Filter="h;hpp;hxx;hm;inl;inc;xsd"
220 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
221 <File
222 RelativePath=".\llanimationstates.h">
223 </File>
224 <File
225 RelativePath=".\llbvhloader.h">
226 </File>
227 <File
228 RelativePath=".\llcharacter.h">
229 </File>
230 <File
231 RelativePath=".\lleditingmotion.h">
232 </File>
233 <File
234 RelativePath=".\llgesture.h">
235 </File>
236 <File
237 RelativePath=".\llhandmotion.h">
238 </File>
239 <File
240 RelativePath=".\llheadrotmotion.h">
241 </File>
242 <File
243 RelativePath=".\lljoint.h">
244 </File>
245 <File
246 RelativePath=".\lljointsolverrp3.h">
247 </File>
248 <File
249 RelativePath=".\lljointstate.h">
250 </File>
251 <File
252 RelativePath=".\llkeyframefallmotion.h">
253 </File>
254 <File
255 RelativePath=".\llkeyframemotion.h">
256 </File>
257 <File
258 RelativePath=".\llkeyframemotionparam.h">
259 </File>
260 <File
261 RelativePath=".\llkeyframestandmotion.h">
262 </File>
263 <File
264 RelativePath=".\llkeyframewalkmotion.h">
265 </File>
266 <File
267 RelativePath=".\llmotion.h">
268 </File>
269 <File
270 RelativePath=".\llmotioncontroller.h">
271 </File>
272 <File
273 RelativePath=".\llmultigesture.h">
274 </File>
275 <File
276 RelativePath=".\llpose.h">
277 </File>
278 <File
279 RelativePath=".\llstatemachine.h">
280 </File>
281 <File
282 RelativePath=".\lltargetingmotion.h">
283 </File>
284 <File
285 RelativePath=".\llvisualparam.h">
286 </File>
287 </Filter>
288 <Filter
289 Name="Resource Files"
290 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
291 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
292 </Filter>
293 </Files>
294 <Globals>
295 </Globals>
296</VisualStudioProject>
diff --git a/linden/indra/llcharacter/llcharacter_vc8.vcproj b/linden/indra/llcharacter/llcharacter_vc8.vcproj
deleted file mode 100644
index fdad9c2..0000000
--- a/linden/indra/llcharacter/llcharacter_vc8.vcproj
+++ /dev/null
@@ -1,419 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="8.00"
5 Name="llcharacter"
6 ProjectGUID="{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
7 RootNamespace="llcharacter"
8 Keyword="Win32Proj"
9 >
10 <Platforms>
11 <Platform
12 Name="Win32"
13 />
14 </Platforms>
15 <ToolFiles>
16 </ToolFiles>
17 <Configurations>
18 <Configuration
19 Name="Debug|Win32"
20 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
21 IntermediateDirectory="Debug"
22 ConfigurationType="4"
23 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
24 CharacterSet="1"
25 >
26 <Tool
27 Name="VCPreBuildEventTool"
28 />
29 <Tool
30 Name="VCCustomBuildTool"
31 />
32 <Tool
33 Name="VCXMLDataGeneratorTool"
34 />
35 <Tool
36 Name="VCWebServiceProxyGeneratorTool"
37 />
38 <Tool
39 Name="VCMIDLTool"
40 />
41 <Tool
42 Name="VCCLCompilerTool"
43 Optimization="0"
44 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
45 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
46 MinimalRebuild="true"
47 BasicRuntimeChecks="3"
48 RuntimeLibrary="1"
49 StructMemberAlignment="4"
50 TreatWChar_tAsBuiltInType="false"
51 ForceConformanceInForLoopScope="true"
52 UsePrecompiledHeader="0"
53 WarningLevel="3"
54 WarnAsError="true"
55 Detect64BitPortabilityProblems="false"
56 DebugInformationFormat="4"
57 />
58 <Tool
59 Name="VCManagedResourceCompilerTool"
60 />
61 <Tool
62 Name="VCResourceCompilerTool"
63 />
64 <Tool
65 Name="VCPreLinkEventTool"
66 />
67 <Tool
68 Name="VCLibrarianTool"
69 OutputFile="$(OutDir)/llcharacter.lib"
70 />
71 <Tool
72 Name="VCALinkTool"
73 />
74 <Tool
75 Name="VCXDCMakeTool"
76 />
77 <Tool
78 Name="VCBscMakeTool"
79 />
80 <Tool
81 Name="VCFxCopTool"
82 />
83 <Tool
84 Name="VCPostBuildEventTool"
85 />
86 </Configuration>
87 <Configuration
88 Name="Release|Win32"
89 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
90 IntermediateDirectory="Release"
91 ConfigurationType="4"
92 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
93 CharacterSet="1"
94 >
95 <Tool
96 Name="VCPreBuildEventTool"
97 />
98 <Tool
99 Name="VCCustomBuildTool"
100 />
101 <Tool
102 Name="VCXMLDataGeneratorTool"
103 />
104 <Tool
105 Name="VCWebServiceProxyGeneratorTool"
106 />
107 <Tool
108 Name="VCMIDLTool"
109 />
110 <Tool
111 Name="VCCLCompilerTool"
112 AdditionalOptions="/Oy-"
113 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
114 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
115 RuntimeLibrary="0"
116 StructMemberAlignment="0"
117 TreatWChar_tAsBuiltInType="false"
118 ForceConformanceInForLoopScope="true"
119 UsePrecompiledHeader="0"
120 WarningLevel="3"
121 WarnAsError="true"
122 Detect64BitPortabilityProblems="false"
123 DebugInformationFormat="3"
124 />
125 <Tool
126 Name="VCManagedResourceCompilerTool"
127 />
128 <Tool
129 Name="VCResourceCompilerTool"
130 />
131 <Tool
132 Name="VCPreLinkEventTool"
133 />
134 <Tool
135 Name="VCLibrarianTool"
136 OutputFile="$(OutDir)/llcharacter.lib"
137 />
138 <Tool
139 Name="VCALinkTool"
140 />
141 <Tool
142 Name="VCXDCMakeTool"
143 />
144 <Tool
145 Name="VCBscMakeTool"
146 />
147 <Tool
148 Name="VCFxCopTool"
149 />
150 <Tool
151 Name="VCPostBuildEventTool"
152 />
153 </Configuration>
154 <Configuration
155 Name="ReleaseNoOpt|Win32"
156 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
157 IntermediateDirectory="$(ConfigurationName)"
158 ConfigurationType="4"
159 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
160 CharacterSet="1"
161 >
162 <Tool
163 Name="VCPreBuildEventTool"
164 />
165 <Tool
166 Name="VCCustomBuildTool"
167 />
168 <Tool
169 Name="VCXMLDataGeneratorTool"
170 />
171 <Tool
172 Name="VCWebServiceProxyGeneratorTool"
173 />
174 <Tool
175 Name="VCMIDLTool"
176 />
177 <Tool
178 Name="VCCLCompilerTool"
179 AdditionalOptions="/Oy-"
180 Optimization="0"
181 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
182 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
183 RuntimeLibrary="0"
184 StructMemberAlignment="0"
185 TreatWChar_tAsBuiltInType="false"
186 ForceConformanceInForLoopScope="true"
187 UsePrecompiledHeader="0"
188 WarningLevel="3"
189 WarnAsError="true"
190 Detect64BitPortabilityProblems="false"
191 DebugInformationFormat="3"
192 />
193 <Tool
194 Name="VCManagedResourceCompilerTool"
195 />
196 <Tool
197 Name="VCResourceCompilerTool"
198 />
199 <Tool
200 Name="VCPreLinkEventTool"
201 />
202 <Tool
203 Name="VCLibrarianTool"
204 OutputFile="$(OutDir)/llcharacter.lib"
205 />
206 <Tool
207 Name="VCALinkTool"
208 />
209 <Tool
210 Name="VCXDCMakeTool"
211 />
212 <Tool
213 Name="VCBscMakeTool"
214 />
215 <Tool
216 Name="VCFxCopTool"
217 />
218 <Tool
219 Name="VCPostBuildEventTool"
220 />
221 </Configuration>
222 </Configurations>
223 <References>
224 </References>
225 <Files>
226 <Filter
227 Name="Source Files"
228 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
229 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
230 >
231 <File
232 RelativePath=".\llanimationstates.cpp"
233 >
234 </File>
235 <File
236 RelativePath=".\llbvhloader.cpp"
237 >
238 </File>
239 <File
240 RelativePath=".\llcharacter.cpp"
241 >
242 </File>
243 <File
244 RelativePath=".\lleditingmotion.cpp"
245 >
246 </File>
247 <File
248 RelativePath=".\llgesture.cpp"
249 >
250 </File>
251 <File
252 RelativePath=".\llhandmotion.cpp"
253 >
254 </File>
255 <File
256 RelativePath=".\llheadrotmotion.cpp"
257 >
258 </File>
259 <File
260 RelativePath=".\lljoint.cpp"
261 >
262 </File>
263 <File
264 RelativePath=".\lljointsolverrp3.cpp"
265 >
266 </File>
267 <File
268 RelativePath=".\llkeyframefallmotion.cpp"
269 >
270 </File>
271 <File
272 RelativePath=".\llkeyframemotion.cpp"
273 >
274 </File>
275 <File
276 RelativePath=".\llkeyframemotionparam.cpp"
277 >
278 </File>
279 <File
280 RelativePath=".\llkeyframestandmotion.cpp"
281 >
282 </File>
283 <File
284 RelativePath=".\llkeyframewalkmotion.cpp"
285 >
286 </File>
287 <File
288 RelativePath=".\llmotion.cpp"
289 >
290 </File>
291 <File
292 RelativePath=".\llmotioncontroller.cpp"
293 >
294 </File>
295 <File
296 RelativePath=".\llmultigesture.cpp"
297 >
298 </File>
299 <File
300 RelativePath=".\llpose.cpp"
301 >
302 </File>
303 <File
304 RelativePath=".\llstatemachine.cpp"
305 >
306 </File>
307 <File
308 RelativePath=".\lltargetingmotion.cpp"
309 >
310 </File>
311 <File
312 RelativePath=".\llvisualparam.cpp"
313 >
314 </File>
315 </Filter>
316 <Filter
317 Name="Header Files"
318 Filter="h;hpp;hxx;hm;inl;inc;xsd"
319 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
320 >
321 <File
322 RelativePath=".\llanimationstates.h"
323 >
324 </File>
325 <File
326 RelativePath=".\llbvhloader.h"
327 >
328 </File>
329 <File
330 RelativePath=".\llcharacter.h"
331 >
332 </File>
333 <File
334 RelativePath=".\lleditingmotion.h"
335 >
336 </File>
337 <File
338 RelativePath=".\llgesture.h"
339 >
340 </File>
341 <File
342 RelativePath=".\llhandmotion.h"
343 >
344 </File>
345 <File
346 RelativePath=".\llheadrotmotion.h"
347 >
348 </File>
349 <File
350 RelativePath=".\lljoint.h"
351 >
352 </File>
353 <File
354 RelativePath=".\lljointsolverrp3.h"
355 >
356 </File>
357 <File
358 RelativePath=".\lljointstate.h"
359 >
360 </File>
361 <File
362 RelativePath=".\llkeyframefallmotion.h"
363 >
364 </File>
365 <File
366 RelativePath=".\llkeyframemotion.h"
367 >
368 </File>
369 <File
370 RelativePath=".\llkeyframemotionparam.h"
371 >
372 </File>
373 <File
374 RelativePath=".\llkeyframestandmotion.h"
375 >
376 </File>
377 <File
378 RelativePath=".\llkeyframewalkmotion.h"
379 >
380 </File>
381 <File
382 RelativePath=".\llmotion.h"
383 >
384 </File>
385 <File
386 RelativePath=".\llmotioncontroller.h"
387 >
388 </File>
389 <File
390 RelativePath=".\llmultigesture.h"
391 >
392 </File>
393 <File
394 RelativePath=".\llpose.h"
395 >
396 </File>
397 <File
398 RelativePath=".\llstatemachine.h"
399 >
400 </File>
401 <File
402 RelativePath=".\lltargetingmotion.h"
403 >
404 </File>
405 <File
406 RelativePath=".\llvisualparam.h"
407 >
408 </File>
409 </Filter>
410 <Filter
411 Name="Resource Files"
412 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
413 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
414 >
415 </Filter>
416 </Files>
417 <Globals>
418 </Globals>
419</VisualStudioProject>
diff --git a/linden/indra/llcharacter/llcharacter_vc9.vcproj b/linden/indra/llcharacter/llcharacter_vc9.vcproj
deleted file mode 100644
index 837ec04..0000000
--- a/linden/indra/llcharacter/llcharacter_vc9.vcproj
+++ /dev/null
@@ -1,420 +0,0 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="9.00"
5 Name="llcharacter"
6 ProjectGUID="{5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}"
7 RootNamespace="llcharacter"
8 Keyword="Win32Proj"
9 TargetFrameworkVersion="131072"
10 >
11 <Platforms>
12 <Platform
13 Name="Win32"
14 />
15 </Platforms>
16 <ToolFiles>
17 </ToolFiles>
18 <Configurations>
19 <Configuration
20 Name="Debug|Win32"
21 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
22 IntermediateDirectory="Debug"
23 ConfigurationType="4"
24 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
25 CharacterSet="1"
26 >
27 <Tool
28 Name="VCPreBuildEventTool"
29 />
30 <Tool
31 Name="VCCustomBuildTool"
32 />
33 <Tool
34 Name="VCXMLDataGeneratorTool"
35 />
36 <Tool
37 Name="VCWebServiceProxyGeneratorTool"
38 />
39 <Tool
40 Name="VCMIDLTool"
41 />
42 <Tool
43 Name="VCCLCompilerTool"
44 Optimization="0"
45 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
46 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
47 MinimalRebuild="true"
48 BasicRuntimeChecks="3"
49 RuntimeLibrary="1"
50 StructMemberAlignment="4"
51 TreatWChar_tAsBuiltInType="false"
52 ForceConformanceInForLoopScope="true"
53 UsePrecompiledHeader="0"
54 WarningLevel="3"
55 WarnAsError="true"
56 Detect64BitPortabilityProblems="false"
57 DebugInformationFormat="4"
58 />
59 <Tool
60 Name="VCManagedResourceCompilerTool"
61 />
62 <Tool
63 Name="VCResourceCompilerTool"
64 />
65 <Tool
66 Name="VCPreLinkEventTool"
67 />
68 <Tool
69 Name="VCLibrarianTool"
70 OutputFile="$(OutDir)/llcharacter.lib"
71 />
72 <Tool
73 Name="VCALinkTool"
74 />
75 <Tool
76 Name="VCXDCMakeTool"
77 />
78 <Tool
79 Name="VCBscMakeTool"
80 />
81 <Tool
82 Name="VCFxCopTool"
83 />
84 <Tool
85 Name="VCPostBuildEventTool"
86 />
87 </Configuration>
88 <Configuration
89 Name="Release|Win32"
90 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
91 IntermediateDirectory="Release"
92 ConfigurationType="4"
93 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
94 CharacterSet="1"
95 >
96 <Tool
97 Name="VCPreBuildEventTool"
98 />
99 <Tool
100 Name="VCCustomBuildTool"
101 />
102 <Tool
103 Name="VCXMLDataGeneratorTool"
104 />
105 <Tool
106 Name="VCWebServiceProxyGeneratorTool"
107 />
108 <Tool
109 Name="VCMIDLTool"
110 />
111 <Tool
112 Name="VCCLCompilerTool"
113 AdditionalOptions="/Oy-"
114 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
115 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
116 RuntimeLibrary="0"
117 StructMemberAlignment="0"
118 TreatWChar_tAsBuiltInType="false"
119 ForceConformanceInForLoopScope="true"
120 UsePrecompiledHeader="0"
121 WarningLevel="3"
122 WarnAsError="true"
123 Detect64BitPortabilityProblems="false"
124 DebugInformationFormat="3"
125 />
126 <Tool
127 Name="VCManagedResourceCompilerTool"
128 />
129 <Tool
130 Name="VCResourceCompilerTool"
131 />
132 <Tool
133 Name="VCPreLinkEventTool"
134 />
135 <Tool
136 Name="VCLibrarianTool"
137 OutputFile="$(OutDir)/llcharacter.lib"
138 />
139 <Tool
140 Name="VCALinkTool"
141 />
142 <Tool
143 Name="VCXDCMakeTool"
144 />
145 <Tool
146 Name="VCBscMakeTool"
147 />
148 <Tool
149 Name="VCFxCopTool"
150 />
151 <Tool
152 Name="VCPostBuildEventTool"
153 />
154 </Configuration>
155 <Configuration
156 Name="ReleaseNoOpt|Win32"
157 OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
158 IntermediateDirectory="$(ConfigurationName)"
159 ConfigurationType="4"
160 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
161 CharacterSet="1"
162 >
163 <Tool
164 Name="VCPreBuildEventTool"
165 />
166 <Tool
167 Name="VCCustomBuildTool"
168 />
169 <Tool
170 Name="VCXMLDataGeneratorTool"
171 />
172 <Tool
173 Name="VCWebServiceProxyGeneratorTool"
174 />
175 <Tool
176 Name="VCMIDLTool"
177 />
178 <Tool
179 Name="VCCLCompilerTool"
180 AdditionalOptions="/Oy-"
181 Optimization="0"
182 AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\llmessage;..\llxml;..\..\libraries\i686-win32\include;..\..\libraries\include\"
183 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
184 RuntimeLibrary="0"
185 StructMemberAlignment="0"
186 TreatWChar_tAsBuiltInType="false"
187 ForceConformanceInForLoopScope="true"
188 UsePrecompiledHeader="0"
189 WarningLevel="3"
190 WarnAsError="true"
191 Detect64BitPortabilityProblems="false"
192 DebugInformationFormat="3"
193 />
194 <Tool
195 Name="VCManagedResourceCompilerTool"
196 />
197 <Tool
198 Name="VCResourceCompilerTool"
199 />
200 <Tool
201 Name="VCPreLinkEventTool"
202 />
203 <Tool
204 Name="VCLibrarianTool"
205 OutputFile="$(OutDir)/llcharacter.lib"
206 />
207 <Tool
208 Name="VCALinkTool"
209 />
210 <Tool
211 Name="VCXDCMakeTool"
212 />
213 <Tool
214 Name="VCBscMakeTool"
215 />
216 <Tool
217 Name="VCFxCopTool"
218 />
219 <Tool
220 Name="VCPostBuildEventTool"
221 />
222 </Configuration>
223 </Configurations>
224 <References>
225 </References>
226 <Files>
227 <Filter
228 Name="Source Files"
229 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
230 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
231 >
232 <File
233 RelativePath=".\llanimationstates.cpp"
234 >
235 </File>
236 <File
237 RelativePath=".\llbvhloader.cpp"
238 >
239 </File>
240 <File
241 RelativePath=".\llcharacter.cpp"
242 >
243 </File>
244 <File
245 RelativePath=".\lleditingmotion.cpp"
246 >
247 </File>
248 <File
249 RelativePath=".\llgesture.cpp"
250 >
251 </File>
252 <File
253 RelativePath=".\llhandmotion.cpp"
254 >
255 </File>
256 <File
257 RelativePath=".\llheadrotmotion.cpp"
258 >
259 </File>
260 <File
261 RelativePath=".\lljoint.cpp"
262 >
263 </File>
264 <File
265 RelativePath=".\lljointsolverrp3.cpp"
266 >
267 </File>
268 <File
269 RelativePath=".\llkeyframefallmotion.cpp"
270 >
271 </File>
272 <File
273 RelativePath=".\llkeyframemotion.cpp"
274 >
275 </File>
276 <File
277 RelativePath=".\llkeyframemotionparam.cpp"
278 >
279 </File>
280 <File
281 RelativePath=".\llkeyframestandmotion.cpp"
282 >
283 </File>
284 <File
285 RelativePath=".\llkeyframewalkmotion.cpp"
286 >
287 </File>
288 <File
289 RelativePath=".\llmotion.cpp"
290 >
291 </File>
292 <File
293 RelativePath=".\llmotioncontroller.cpp"
294 >
295 </File>
296 <File
297 RelativePath=".\llmultigesture.cpp"
298 >
299 </File>
300 <File
301 RelativePath=".\llpose.cpp"
302 >
303 </File>
304 <File
305 RelativePath=".\llstatemachine.cpp"
306 >
307 </File>
308 <File
309 RelativePath=".\lltargetingmotion.cpp"
310 >
311 </File>
312 <File
313 RelativePath=".\llvisualparam.cpp"
314 >
315 </File>
316 </Filter>
317 <Filter
318 Name="Header Files"
319 Filter="h;hpp;hxx;hm;inl;inc;xsd"
320 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
321 >
322 <File
323 RelativePath=".\llanimationstates.h"
324 >
325 </File>
326 <File
327 RelativePath=".\llbvhloader.h"
328 >
329 </File>
330 <File
331 RelativePath=".\llcharacter.h"
332 >
333 </File>
334 <File
335 RelativePath=".\lleditingmotion.h"
336 >
337 </File>
338 <File
339 RelativePath=".\llgesture.h"
340 >
341 </File>
342 <File
343 RelativePath=".\llhandmotion.h"
344 >
345 </File>
346 <File
347 RelativePath=".\llheadrotmotion.h"
348 >
349 </File>
350 <File
351 RelativePath=".\lljoint.h"
352 >
353 </File>
354 <File
355 RelativePath=".\lljointsolverrp3.h"
356 >
357 </File>
358 <File
359 RelativePath=".\lljointstate.h"
360 >
361 </File>
362 <File
363 RelativePath=".\llkeyframefallmotion.h"
364 >
365 </File>
366 <File
367 RelativePath=".\llkeyframemotion.h"
368 >
369 </File>
370 <File
371 RelativePath=".\llkeyframemotionparam.h"
372 >
373 </File>
374 <File
375 RelativePath=".\llkeyframestandmotion.h"
376 >
377 </File>
378 <File
379 RelativePath=".\llkeyframewalkmotion.h"
380 >
381 </File>
382 <File
383 RelativePath=".\llmotion.h"
384 >
385 </File>
386 <File
387 RelativePath=".\llmotioncontroller.h"
388 >
389 </File>
390 <File
391 RelativePath=".\llmultigesture.h"
392 >
393 </File>
394 <File
395 RelativePath=".\llpose.h"
396 >
397 </File>
398 <File
399 RelativePath=".\llstatemachine.h"
400 >
401 </File>
402 <File
403 RelativePath=".\lltargetingmotion.h"
404 >
405 </File>
406 <File
407 RelativePath=".\llvisualparam.h"
408 >
409 </File>
410 </Filter>
411 <Filter
412 Name="Resource Files"
413 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
414 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
415 >
416 </Filter>
417 </Files>
418 <Globals>
419 </Globals>
420</VisualStudioProject>
diff --git a/linden/indra/llcharacter/llgesture.cpp b/linden/indra/llcharacter/llgesture.cpp
index 60f0624..335e5c6 100644
--- a/linden/indra/llcharacter/llgesture.cpp
+++ b/linden/indra/llcharacter/llgesture.cpp
@@ -191,11 +191,11 @@ LLGestureList::LLGestureList()
191 mList.put(gesture); 191 mList.put(gesture);
192 192
193 gesture = new LLGesture(KEY_F4, MASK_NONE, "/boogie", 193 gesture = new LLGesture(KEY_F4, MASK_NONE, "/boogie",
194 LLUUID::null, "dance4", LLString::null ); 194 LLUUID::null, "dance4", LLStringUtil::null );
195 mList.put(gesture); 195 mList.put(gesture);
196 196
197 gesture = new LLGesture(KEY_F5, MASK_SHIFT, "/tongue", 197 gesture = new LLGesture(KEY_F5, MASK_SHIFT, "/tongue",
198 LLUUID::null, "Express_Tongue_Out", LLString::null ); 198 LLUUID::null, "Express_Tongue_Out", LLStringUtil::null );
199 mList.put(gesture); 199 mList.put(gesture);
200 */ 200 */
201} 201}
@@ -219,9 +219,9 @@ void LLGestureList::deleteAll()
219// Iterates through space delimited tokens in string, triggering any gestures found. 219// Iterates through space delimited tokens in string, triggering any gestures found.
220// Generates a revised string that has the found tokens replaced by their replacement strings 220// Generates a revised string that has the found tokens replaced by their replacement strings
221// and (as a minor side effect) has multiple spaces in a row replaced by single spaces. 221// and (as a minor side effect) has multiple spaces in a row replaced by single spaces.
222BOOL LLGestureList::triggerAndReviseString(const LLString &string, LLString* revised_string) 222BOOL LLGestureList::triggerAndReviseString(const std::string &string, std::string* revised_string)
223{ 223{
224 LLString tokenized = string; 224 std::string tokenized = string;
225 225
226 BOOL found_gestures = FALSE; 226 BOOL found_gestures = FALSE;
227 BOOL first_token = TRUE; 227 BOOL first_token = TRUE;
@@ -237,8 +237,8 @@ BOOL LLGestureList::triggerAndReviseString(const LLString &string, LLString* rev
237 237
238 if( !found_gestures ) // Only pay attention to the first gesture in the string. 238 if( !found_gestures ) // Only pay attention to the first gesture in the string.
239 { 239 {
240 LLString cur_token_lower = *token_iter; 240 std::string cur_token_lower = *token_iter;
241 LLString::toLower(cur_token_lower); 241 LLStringUtil::toLower(cur_token_lower);
242 242
243 for (S32 i = 0; i < mList.count(); i++) 243 for (S32 i = 0; i < mList.count(); i++)
244 { 244 {
@@ -254,15 +254,15 @@ BOOL LLGestureList::triggerAndReviseString(const LLString &string, LLString* rev
254 254
255 // Don't muck with the user's capitalization if we don't have to. 255 // Don't muck with the user's capitalization if we don't have to.
256 const std::string& output = gesture->getOutputString(); 256 const std::string& output = gesture->getOutputString();
257 LLString output_lower = LLString(output.c_str()); 257 std::string output_lower = std::string(output.c_str());
258 LLString::toLower(output_lower); 258 LLStringUtil::toLower(output_lower);
259 if( cur_token_lower == output_lower ) 259 if( cur_token_lower == output_lower )
260 { 260 {
261 revised_string->append(*token_iter); 261 revised_string->append(*token_iter);
262 } 262 }
263 else 263 else
264 { 264 {
265 revised_string->append(output.c_str()); 265 revised_string->append(output);
266 } 266 }
267 267
268 } 268 }
diff --git a/linden/indra/llcharacter/llgesture.h b/linden/indra/llcharacter/llgesture.h
index 003d236..8800887 100644
--- a/linden/indra/llcharacter/llgesture.h
+++ b/linden/indra/llcharacter/llgesture.h
@@ -93,7 +93,7 @@ public:
93 BOOL trigger(KEY key, MASK mask); 93 BOOL trigger(KEY key, MASK mask);
94 94
95 // Triggers if substring matches and generates revised string. 95 // Triggers if substring matches and generates revised string.
96 BOOL triggerAndReviseString(const LLString &string, LLString* revised_string); 96 BOOL triggerAndReviseString(const std::string &string, std::string* revised_string);
97 97
98 // Used for construction from UI 98 // Used for construction from UI
99 S32 count() const { return mList.count(); } 99 S32 count() const { return mList.count(); }
diff --git a/linden/indra/llcharacter/llhandmotion.cpp b/linden/indra/llcharacter/llhandmotion.cpp
index 3902518..f51e0d0 100644
--- a/linden/indra/llcharacter/llhandmotion.cpp
+++ b/linden/indra/llcharacter/llhandmotion.cpp
@@ -201,16 +201,16 @@ void LLHandMotion::onDeactivate()
201//----------------------------------------------------------------------------- 201//-----------------------------------------------------------------------------
202// LLHandMotion::getHandPoseName() 202// LLHandMotion::getHandPoseName()
203//----------------------------------------------------------------------------- 203//-----------------------------------------------------------------------------
204LLString LLHandMotion::getHandPoseName(eHandPose pose) 204std::string LLHandMotion::getHandPoseName(eHandPose pose)
205{ 205{
206 if ((S32)pose < LLHandMotion::NUM_HAND_POSES && (S32)pose >= 0) 206 if ((S32)pose < LLHandMotion::NUM_HAND_POSES && (S32)pose >= 0)
207 { 207 {
208 return gHandPoseNames[pose]; 208 return std::string(gHandPoseNames[pose]);
209 } 209 }
210 return ""; 210 return LLStringUtil::null;
211} 211}
212 212
213LLHandMotion::eHandPose LLHandMotion::getHandPose(LLString posename) 213LLHandMotion::eHandPose LLHandMotion::getHandPose(std::string posename)
214{ 214{
215 for (S32 pose = 0; pose < LLHandMotion::NUM_HAND_POSES; ++pose) 215 for (S32 pose = 0; pose < LLHandMotion::NUM_HAND_POSES; ++pose)
216 { 216 {
diff --git a/linden/indra/llcharacter/llhandmotion.h b/linden/indra/llcharacter/llhandmotion.h
index 548e4de..b6cc175 100644
--- a/linden/indra/llcharacter/llhandmotion.h
+++ b/linden/indra/llcharacter/llhandmotion.h
@@ -126,8 +126,8 @@ public:
126 126
127 virtual BOOL canDeprecate() { return FALSE; } 127 virtual BOOL canDeprecate() { return FALSE; }
128 128
129 static LLString getHandPoseName(eHandPose pose); 129 static std::string getHandPoseName(eHandPose pose);
130 static eHandPose getHandPose(LLString posename); 130 static eHandPose getHandPose(std::string posename);
131 131
132public: 132public:
133 //------------------------------------------------------------------------- 133 //-------------------------------------------------------------------------
diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp
index 34decd6..f53b01f 100644
--- a/linden/indra/llcharacter/llkeyframemotion.cpp
+++ b/linden/indra/llcharacter/llkeyframemotion.cpp
@@ -71,6 +71,15 @@ static F32 MAX_CONSTRAINTS = 10;
71// JointMotionList 71// JointMotionList
72//----------------------------------------------------------------------------- 72//-----------------------------------------------------------------------------
73LLKeyframeMotion::JointMotionList::JointMotionList() 73LLKeyframeMotion::JointMotionList::JointMotionList()
74 : mDuration(0.f),
75 mLoop(FALSE),
76 mLoopInPoint(0.f),
77 mLoopOutPoint(0.f),
78 mEaseInDuration(0.f),
79 mEaseOutDuration(0.f),
80 mBasePriority(LLJoint::LOW_PRIORITY),
81 mHandPose(LLHandMotion::HAND_POSE_SPREAD),
82 mMaxPriority(LLJoint::LOW_PRIORITY)
74{ 83{
75} 84}
76 85
@@ -646,9 +655,9 @@ BOOL LLKeyframeMotion::setupPose()
646BOOL LLKeyframeMotion::onActivate() 655BOOL LLKeyframeMotion::onActivate()
647{ 656{
648 // If the keyframe anim has an associated emote, trigger it. 657 // If the keyframe anim has an associated emote, trigger it.
649 if( mEmoteName.length() > 0 ) 658 if( mJointMotionList->mEmoteName.length() > 0 )
650 { 659 {
651 mCharacter->startMotion( gAnimLibrary.stringToAnimState(mEmoteName.c_str()) ); 660 mCharacter->startMotion( gAnimLibrary.stringToAnimState(mJointMotionList->mEmoteName) );
652 } 661 }
653 662
654 mLastLoopedTime = 0.f; 663 mLastLoopedTime = 0.f;
@@ -1221,7 +1230,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
1221 //------------------------------------------------------------------------- 1230 //-------------------------------------------------------------------------
1222 // get emote (optional) 1231 // get emote (optional)
1223 //------------------------------------------------------------------------- 1232 //-------------------------------------------------------------------------
1224 if (!dp.unpackString(mEmoteName, "emote_name")) 1233 if (!dp.unpackString(mJointMotionList->mEmoteName, "emote_name"))
1225 { 1234 {
1226 llwarns << "can't read optional_emote_animation" << llendl; 1235 llwarns << "can't read optional_emote_animation" << llendl;
1227 return FALSE; 1236 return FALSE;
@@ -1663,7 +1672,7 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp)
1663 if (!parent) 1672 if (!parent)
1664 { 1673 {
1665 llwarns << "Joint with no parent: " << joint->getName() 1674 llwarns << "Joint with no parent: " << joint->getName()
1666 << " Emote: " << mEmoteName << llendl; 1675 << " Emote: " << mJointMotionList->mEmoteName << llendl;
1667 return FALSE; 1676 return FALSE;
1668 } 1677 }
1669 joint = parent; 1678 joint = parent;
@@ -1701,7 +1710,7 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
1701 success &= dp.packU16(KEYFRAME_MOTION_SUBVERSION, "sub_version"); 1710 success &= dp.packU16(KEYFRAME_MOTION_SUBVERSION, "sub_version");
1702 success &= dp.packS32(mJointMotionList->mBasePriority, "base_priority"); 1711 success &= dp.packS32(mJointMotionList->mBasePriority, "base_priority");
1703 success &= dp.packF32(mJointMotionList->mDuration, "duration"); 1712 success &= dp.packF32(mJointMotionList->mDuration, "duration");
1704 success &= dp.packString(mEmoteName.c_str(), "emote_name"); 1713 success &= dp.packString(mJointMotionList->mEmoteName, "emote_name");
1705 success &= dp.packF32(mJointMotionList->mLoopInPoint, "loop_in_point"); 1714 success &= dp.packF32(mJointMotionList->mLoopInPoint, "loop_in_point");
1706 success &= dp.packF32(mJointMotionList->mLoopOutPoint, "loop_out_point"); 1715 success &= dp.packF32(mJointMotionList->mLoopOutPoint, "loop_out_point");
1707 success &= dp.packS32(mJointMotionList->mLoop, "loop"); 1716 success &= dp.packS32(mJointMotionList->mLoop, "loop");
@@ -1713,7 +1722,7 @@ BOOL LLKeyframeMotion::serialize(LLDataPacker& dp) const
1713 for (U32 i = 0; i < mJointMotionList->getNumJointMotions(); i++) 1722 for (U32 i = 0; i < mJointMotionList->getNumJointMotions(); i++)
1714 { 1723 {
1715 JointMotion* joint_motionp = mJointMotionList->getJointMotion(i); 1724 JointMotion* joint_motionp = mJointMotionList->getJointMotion(i);
1716 success &= dp.packString(joint_motionp->mJointName.c_str(), "joint_name"); 1725 success &= dp.packString(joint_motionp->mJointName, "joint_name");
1717 success &= dp.packS32(joint_motionp->mPriority, "joint_priority"); 1726 success &= dp.packS32(joint_motionp->mPriority, "joint_priority");
1718 success &= dp.packS32(joint_motionp->mRotationCurve.mNumKeys, "num_rot_keys"); 1727 success &= dp.packS32(joint_motionp->mRotationCurve.mNumKeys, "num_rot_keys");
1719 1728
@@ -1839,11 +1848,11 @@ void LLKeyframeMotion::setEmote(const LLUUID& emote_id)
1839 const char* emote_name = gAnimLibrary.animStateToString(emote_id); 1848 const char* emote_name = gAnimLibrary.animStateToString(emote_id);
1840 if (emote_name) 1849 if (emote_name)
1841 { 1850 {
1842 mEmoteName = emote_name; 1851 mJointMotionList->mEmoteName = emote_name;
1843 } 1852 }
1844 else 1853 else
1845 { 1854 {
1846 mEmoteName = ""; 1855 mJointMotionList->mEmoteName = "";
1847 } 1856 }
1848} 1857}
1849 1858
@@ -2114,11 +2123,19 @@ void LLKeyframeDataCache::clear()
2114//----------------------------------------------------------------------------- 2123//-----------------------------------------------------------------------------
2115LLKeyframeMotion::JointConstraint::JointConstraint(JointConstraintSharedData* shared_data) : mSharedData(shared_data) 2124LLKeyframeMotion::JointConstraint::JointConstraint(JointConstraintSharedData* shared_data) : mSharedData(shared_data)
2116{ 2125{
2126 mWeight = 0.f;
2117 mTotalLength = 0.f; 2127 mTotalLength = 0.f;
2118 mActive = FALSE; 2128 mActive = FALSE;
2119 mSourceVolume = NULL; 2129 mSourceVolume = NULL;
2120 mTargetVolume = NULL; 2130 mTargetVolume = NULL;
2121 mFixupDistanceRMS = 0.f; 2131 mFixupDistanceRMS = 0.f;
2132
2133 int i;
2134 for (i=0; i<MAX_CHAIN_LENGTH; ++i)
2135 {
2136 mJointLengths[i] = 0.f;
2137 mJointLengthFractions[i] = 0.f;
2138 }
2122} 2139}
2123 2140
2124//----------------------------------------------------------------------------- 2141//-----------------------------------------------------------------------------
diff --git a/linden/indra/llcharacter/llkeyframemotion.h b/linden/indra/llcharacter/llkeyframemotion.h
index 5f897cf..393b191 100644
--- a/linden/indra/llcharacter/llkeyframemotion.h
+++ b/linden/indra/llcharacter/llkeyframemotion.h
@@ -224,7 +224,11 @@ protected:
224 mEaseOutStopTime(0.f), 224 mEaseOutStopTime(0.f),
225 mUseTargetOffset(FALSE), 225 mUseTargetOffset(FALSE),
226 mConstraintType(TYPE_POINT), 226 mConstraintType(TYPE_POINT),
227 mConstraintTargetType(TYPE_BODY) {}; 227 mConstraintTargetType(TYPE_BODY),
228 mSourceConstraintVolume(0),
229 mTargetConstraintVolume(0),
230 mJointStateIndices(NULL)
231 { };
228 ~JointConstraintSharedData() { delete [] mJointStateIndices; } 232 ~JointConstraintSharedData() { delete [] mJointStateIndices; }
229 233
230 S32 mSourceConstraintVolume; 234 S32 mSourceConstraintVolume;
@@ -416,6 +420,10 @@ public:
416 typedef std::list<JointConstraintSharedData*> constraint_list_t; 420 typedef std::list<JointConstraintSharedData*> constraint_list_t;
417 constraint_list_t mConstraints; 421 constraint_list_t mConstraints;
418 LLBBoxLocal mPelvisBBox; 422 LLBBoxLocal mPelvisBBox;
423 // mEmoteName is a facial motion, but it's necessary to appear here so that it's cached.
424 // TODO: LLKeyframeDataCache::getKeyframeData should probably return a class containing
425 // JointMotionList and mEmoteName, see LLKeyframeMotion::onInitialize.
426 std::string mEmoteName;
419 public: 427 public:
420 JointMotionList(); 428 JointMotionList();
421 ~JointMotionList(); 429 ~JointMotionList();
@@ -435,7 +443,6 @@ protected:
435 std::vector<LLPointer<LLJointState> > mJointStates; 443 std::vector<LLPointer<LLJointState> > mJointStates;
436 LLJoint* mPelvisp; 444 LLJoint* mPelvisp;
437 LLCharacter* mCharacter; 445 LLCharacter* mCharacter;
438 std::string mEmoteName;
439 typedef std::list<JointConstraint*> constraint_list_t; 446 typedef std::list<JointConstraint*> constraint_list_t;
440 constraint_list_t mConstraints; 447 constraint_list_t mConstraints;
441 U32 mLastSkeletonSerialNum; 448 U32 mLastSkeletonSerialNum;
diff --git a/linden/indra/llcharacter/llkeyframemotionparam.cpp b/linden/indra/llcharacter/llkeyframemotionparam.cpp
index 0e7388c..c22ef26 100644
--- a/linden/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/linden/indra/llcharacter/llkeyframemotionparam.cpp
@@ -346,10 +346,8 @@ BOOL LLKeyframeMotionParam::loadMotions()
346 // Load named file by concatenating the character prefix with the motion name. 346 // Load named file by concatenating the character prefix with the motion name.
347 // Load data into a buffer to be parsed. 347 // Load data into a buffer to be parsed.
348 //------------------------------------------------------------------------- 348 //-------------------------------------------------------------------------
349 char path[LL_MAX_PATH]; /* Flawfinder: ignore */ 349 std::string path = gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix())
350 snprintf( path,sizeof(path), "%s_%s.llp", 350 + "_" + getName() + ".llp";
351 gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix()).c_str(),
352 getName().c_str() );
353 351
354 //------------------------------------------------------------------------- 352 //-------------------------------------------------------------------------
355 // open the file 353 // open the file
@@ -436,7 +434,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
436 return FALSE; 434 return FALSE;
437 } 435 }
438 436
439 addKeyframeMotion(strA, gAnimLibrary.stringToAnimState(strA), strB, floatA); 437 addKeyframeMotion(strA, gAnimLibrary.stringToAnimState(std::string(strA)), strB, floatA);
440 if (isFirstMotion) 438 if (isFirstMotion)
441 { 439 {
442 isFirstMotion = FALSE; 440 isFirstMotion = FALSE;
diff --git a/linden/indra/llcharacter/llkeyframewalkmotion.cpp b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
index d5f6b81..dae24ee 100644
--- a/linden/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -139,9 +139,16 @@ BOOL LLKeyframeWalkMotion::onUpdate(F32 time, U8* joint_mask)
139// LLWalkAdjustMotion() 139// LLWalkAdjustMotion()
140// Class Constructor 140// Class Constructor
141//----------------------------------------------------------------------------- 141//-----------------------------------------------------------------------------
142LLWalkAdjustMotion::LLWalkAdjustMotion(const LLUUID &id) : LLMotion(id) 142LLWalkAdjustMotion::LLWalkAdjustMotion(const LLUUID &id) :
143 LLMotion(id),
144 mLastTime(0.f),
145 mAvgCorrection(0.f),
146 mSpeedAdjust(0.f),
147 mAnimSpeed(0.f),
148 mAvgSpeed(0.f),
149 mRelativeDir(0.f),
150 mAnkleOffset(0.f)
143{ 151{
144 mLastTime = 0.f;
145 mName = "walk_adjust"; 152 mName = "walk_adjust";
146 153
147 mPelvisState = new LLJointState; 154 mPelvisState = new LLJointState;
@@ -349,7 +356,8 @@ void LLWalkAdjustMotion::onDeactivate()
349// LLFlyAdjustMotion::LLFlyAdjustMotion() 356// LLFlyAdjustMotion::LLFlyAdjustMotion()
350//----------------------------------------------------------------------------- 357//-----------------------------------------------------------------------------
351LLFlyAdjustMotion::LLFlyAdjustMotion(const LLUUID &id) 358LLFlyAdjustMotion::LLFlyAdjustMotion(const LLUUID &id)
352 : LLMotion(id) 359 : LLMotion(id),
360 mRoll(0.f)
353{ 361{
354 mName = "fly_adjust"; 362 mName = "fly_adjust";
355 363
diff --git a/linden/indra/llcharacter/llmotion.h b/linden/indra/llcharacter/llmotion.h
index 5a622a8..49f102a 100644
--- a/linden/indra/llcharacter/llmotion.h
+++ b/linden/indra/llcharacter/llmotion.h
@@ -51,13 +51,13 @@ class LLMotion
51 friend class LLMotionController; 51 friend class LLMotionController;
52 52
53public: 53public:
54 typedef enum LLMotionBlendType 54 enum LLMotionBlendType
55 { 55 {
56 NORMAL_BLEND, 56 NORMAL_BLEND,
57 ADDITIVE_BLEND 57 ADDITIVE_BLEND
58 }; 58 };
59 59
60 typedef enum LLMotionInitStatus 60 enum LLMotionInitStatus
61 { 61 {
62 STATUS_FAILURE, 62 STATUS_FAILURE,
63 STATUS_SUCCESS, 63 STATUS_SUCCESS,
diff --git a/linden/indra/llcharacter/llmotioncontroller.h b/linden/indra/llcharacter/llmotioncontroller.h
index 209f689..ee85fd0 100644
--- a/linden/indra/llcharacter/llmotioncontroller.h
+++ b/linden/indra/llcharacter/llmotioncontroller.h
@@ -215,10 +215,10 @@ protected:
215 F32 mLastTime; 215 F32 mLastTime;
216 BOOL mHasRunOnce; 216 BOOL mHasRunOnce;
217 BOOL mPaused; 217 BOOL mPaused;
218 F32 mPauseTime;
218 F32 mTimeStep; 219 F32 mTimeStep;
219 S32 mTimeStepCount; 220 S32 mTimeStepCount;
220 F32 mLastInterp; 221 F32 mLastInterp;
221 F32 mPauseTime;
222 222
223 U8 mJointSignature[2][LL_CHARACTER_MAX_JOINTS]; 223 U8 mJointSignature[2][LL_CHARACTER_MAX_JOINTS];
224}; 224};
diff --git a/linden/indra/llcharacter/llmultigesture.cpp b/linden/indra/llcharacter/llmultigesture.cpp
index 02016a0..5e6a0d6 100644
--- a/linden/indra/llcharacter/llmultigesture.cpp
+++ b/linden/indra/llcharacter/llmultigesture.cpp
@@ -124,8 +124,8 @@ BOOL LLMultiGesture::serialize(LLDataPacker& dp) const
124 dp.packS32(GESTURE_VERSION, "version"); 124 dp.packS32(GESTURE_VERSION, "version");
125 dp.packU8(mKey, "key"); 125 dp.packU8(mKey, "key");
126 dp.packU32(mMask, "mask"); 126 dp.packU32(mMask, "mask");
127 dp.packString(mTrigger.c_str(), "trigger"); 127 dp.packString(mTrigger, "trigger");
128 dp.packString(mReplaceText.c_str(), "replace"); 128 dp.packString(mReplaceText, "replace");
129 129
130 S32 count = (S32)mSteps.size(); 130 S32 count = (S32)mSteps.size();
131 dp.packS32(count, "step_count"); 131 dp.packS32(count, "step_count");
@@ -269,7 +269,7 @@ S32 LLGestureStepAnimation::getMaxSerialSize() const
269 269
270BOOL LLGestureStepAnimation::serialize(LLDataPacker& dp) const 270BOOL LLGestureStepAnimation::serialize(LLDataPacker& dp) const
271{ 271{
272 dp.packString(mAnimName.c_str(), "anim_name"); 272 dp.packString(mAnimName, "anim_name");
273 dp.packUUID(mAnimAssetID, "asset_id"); 273 dp.packUUID(mAnimAssetID, "asset_id");
274 dp.packU32(mFlags, "flags"); 274 dp.packU32(mFlags, "flags");
275 return TRUE; 275 return TRUE;
@@ -344,7 +344,7 @@ S32 LLGestureStepSound::getMaxSerialSize() const
344 344
345BOOL LLGestureStepSound::serialize(LLDataPacker& dp) const 345BOOL LLGestureStepSound::serialize(LLDataPacker& dp) const
346{ 346{
347 dp.packString(mSoundName.c_str(), "sound_name"); 347 dp.packString(mSoundName, "sound_name");
348 dp.packUUID(mSoundAssetID, "asset_id"); 348 dp.packUUID(mSoundAssetID, "asset_id");
349 dp.packU32(mFlags, "flags"); 349 dp.packU32(mFlags, "flags");
350 return TRUE; 350 return TRUE;
@@ -401,7 +401,7 @@ S32 LLGestureStepChat::getMaxSerialSize() const
401 401
402BOOL LLGestureStepChat::serialize(LLDataPacker& dp) const 402BOOL LLGestureStepChat::serialize(LLDataPacker& dp) const
403{ 403{
404 dp.packString(mChatText.c_str(), "chat_text"); 404 dp.packString(mChatText, "chat_text");
405 dp.packU32(mFlags, "flags"); 405 dp.packU32(mFlags, "flags");
406 return TRUE; 406 return TRUE;
407} 407}
diff --git a/linden/indra/llcharacter/llpose.cpp b/linden/indra/llcharacter/llpose.cpp
index f496b7b..5b75a98 100644
--- a/linden/indra/llcharacter/llpose.cpp
+++ b/linden/indra/llcharacter/llpose.cpp
@@ -188,6 +188,7 @@ LLJointStateBlender::LLJointStateBlender()
188 { 188 {
189 mJointStates[i] = NULL; 189 mJointStates[i] = NULL;
190 mPriorities[i] = S32_MIN; 190 mPriorities[i] = S32_MIN;
191 mAdditiveBlends[i] = FALSE;
191 } 192 }
192} 193}
193 194
@@ -458,6 +459,7 @@ void LLJointStateBlender::resetCachedJoint()
458//----------------------------------------------------------------------------- 459//-----------------------------------------------------------------------------
459 460
460LLPoseBlender::LLPoseBlender() 461LLPoseBlender::LLPoseBlender()
462 : mNextPoseSlot(0)
461{ 463{
462} 464}
463 465
diff --git a/linden/indra/llcharacter/llstatemachine.cpp b/linden/indra/llcharacter/llstatemachine.cpp
index eab6e7f..564fbbc 100644
--- a/linden/indra/llcharacter/llstatemachine.cpp
+++ b/linden/indra/llcharacter/llstatemachine.cpp
@@ -206,7 +206,7 @@ LLFSMState* LLStateDiagram::getState(U32 state_id)
206 return NULL; 206 return NULL;
207} 207}
208 208
209BOOL LLStateDiagram::saveDotFile(const char* filename) 209BOOL LLStateDiagram::saveDotFile(const std::string& filename)
210{ 210{
211 apr_file_t* dot_file = ll_apr_file_open(filename, LL_APR_W); 211 apr_file_t* dot_file = ll_apr_file_open(filename, LL_APR_W);
212 212
diff --git a/linden/indra/llcharacter/llstatemachine.h b/linden/indra/llcharacter/llstatemachine.h
index 873e938..a833629 100644
--- a/linden/indra/llcharacter/llstatemachine.h
+++ b/linden/indra/llcharacter/llstatemachine.h
@@ -115,7 +115,7 @@ protected:
115 115
116public: 116public:
117 // save the graph in a DOT file for rendering and visualization 117 // save the graph in a DOT file for rendering and visualization
118 BOOL saveDotFile(const char* filename); 118 BOOL saveDotFile(const std::string& filename);
119}; 119};
120 120
121class LLStateMachine 121class LLStateMachine
diff --git a/linden/indra/llcharacter/llvisualparam.cpp b/linden/indra/llcharacter/llvisualparam.cpp
index 00b1072..e3320f8 100644
--- a/linden/indra/llcharacter/llvisualparam.cpp
+++ b/linden/indra/llcharacter/llvisualparam.cpp
@@ -89,7 +89,7 @@ BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
89 } 89 }
90 90
91 // attribute: sex 91 // attribute: sex
92 LLString sex = "both"; 92 std::string sex = "both";
93 static LLStdStringHandle sex_string = LLXmlTree::addAttributeString("sex"); 93 static LLStdStringHandle sex_string = LLXmlTree::addAttributeString("sex");
94 node->getFastAttributeString( sex_string, sex ); // optional 94 node->getFastAttributeString( sex_string, sex ); // optional
95 if( sex == "both" ) 95 if( sex == "both" )
@@ -127,7 +127,7 @@ BOOL LLVisualParamInfo::parseXml(LLXmlTreeNode *node)
127 127
128 // JC - make sure the display name includes the capitalization in the XML file, 128 // JC - make sure the display name includes the capitalization in the XML file,
129 // not the lowercased version. 129 // not the lowercased version.
130 LLString::toLower(mName); 130 LLStringUtil::toLower(mName);
131 131
132 // attribute: label_min 132 // attribute: label_min
133 static LLStdStringHandle label_min_string = LLXmlTree::addAttributeString("label_min"); 133 static LLStdStringHandle label_min_string = LLXmlTree::addAttributeString("label_min");
diff --git a/linden/indra/llcharacter/llvisualparam.h b/linden/indra/llcharacter/llvisualparam.h
index 41b8a05..39fff0f 100644
--- a/linden/indra/llcharacter/llvisualparam.h
+++ b/linden/indra/llcharacter/llvisualparam.h
@@ -71,10 +71,10 @@ public:
71protected: 71protected:
72 S32 mID; // ID associated with VisualParam 72 S32 mID; // ID associated with VisualParam
73 73
74 LLString mName; // name (for internal purposes) 74 std::string mName; // name (for internal purposes)
75 LLString mDisplayName; // name displayed to the user 75 std::string mDisplayName; // name displayed to the user
76 LLString mMinName; // name associated with minimum value 76 std::string mMinName; // name associated with minimum value
77 LLString mMaxName; // name associated with maximum value 77 std::string mMaxName; // name associated with maximum value
78 EVisualParamGroup mGroup; // morph group for separating UI controls 78 EVisualParamGroup mGroup; // morph group for separating UI controls
79 F32 mMinWeight; // minimum weight that can be assigned to this morph target 79 F32 mMinWeight; // minimum weight that can be assigned to this morph target
80 F32 mMaxWeight; // maximum weight that can be assigned to this morph target 80 F32 mMaxWeight; // maximum weight that can be assigned to this morph target
@@ -114,14 +114,14 @@ public:
114 S32 getID() { return mID; } 114 S32 getID() { return mID; }
115 void setID(S32 id) { llassert(!mInfo); mID = id; } 115 void setID(S32 id) { llassert(!mInfo); mID = id; }
116 116
117 const LLString& getName() const { return mInfo->mName; } 117 const std::string& getName() const { return mInfo->mName; }
118 const LLString& getDisplayName() const { return mInfo->mDisplayName; } 118 const std::string& getDisplayName() const { return mInfo->mDisplayName; }
119 const LLString& getMaxDisplayName() const { return mInfo->mMaxName; } 119 const std::string& getMaxDisplayName() const { return mInfo->mMaxName; }
120 const LLString& getMinDisplayName() const { return mInfo->mMinName; } 120 const std::string& getMinDisplayName() const { return mInfo->mMinName; }
121 121
122 void setDisplayName(const LLString& s) { mInfo->mDisplayName = s; } 122 void setDisplayName(const std::string& s) { mInfo->mDisplayName = s; }
123 void setMaxDisplayName(const LLString& s) { mInfo->mMaxName = s; } 123 void setMaxDisplayName(const std::string& s) { mInfo->mMaxName = s; }
124 void setMinDisplayName(const LLString& s) { mInfo->mMinName = s; } 124 void setMinDisplayName(const std::string& s) { mInfo->mMinName = s; }
125 125
126 EVisualParamGroup getGroup() { return mInfo->mGroup; } 126 EVisualParamGroup getGroup() { return mInfo->mGroup; }
127 F32 getMinWeight() { return mInfo->mMinWeight; } 127 F32 getMinWeight() { return mInfo->mMinWeight; }
generated by cgit v1.1 at 2025-02-06 05:04:46 +0000