aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/lscript/lscript_library
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/lscript/lscript_library
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/lscript/lscript_library')
-rw-r--r--linden/indra/lscript/lscript_library/lscript_alloc.cpp87
-rw-r--r--linden/indra/lscript/lscript_library/lscript_library.cpp44
-rw-r--r--linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj268
3 files changed, 317 insertions, 82 deletions
diff --git a/linden/indra/lscript/lscript_library/lscript_alloc.cpp b/linden/indra/lscript/lscript_library/lscript_alloc.cpp
index 4636c0b..b39cd1f 100644
--- a/linden/indra/lscript/lscript_library/lscript_alloc.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_alloc.cpp
@@ -127,10 +127,10 @@ S32 lsa_heap_add_data(U8 *buffer, LLScriptLibData *data, S32 heapsize, BOOL b_de
127 size = 4; 127 size = 4;
128 break; 128 break;
129 case LST_KEY: 129 case LST_KEY:
130 size = (S32)strlen(data->mKey) + 1; 130 size = (S32)strlen(data->mKey) + 1; /*Flawfinder: ignore*/
131 break; 131 break;
132 case LST_STRING: 132 case LST_STRING:
133 size = (S32)strlen(data->mString) + 1; 133 size = (S32)strlen(data->mString) + 1; /*Flawfinder: ignore*/
134 break; 134 break;
135 case LST_LIST: 135 case LST_LIST:
136 // list data 4 bytes of number of entries followed by number of pointer 136 // list data 4 bytes of number of entries followed by number of pointer
@@ -354,7 +354,7 @@ S32 lsa_create_data_block(U8 **buffer, LLScriptLibData *data, S32 base_offset)
354 { 354 {
355 if (data->mString) 355 if (data->mString)
356 { 356 {
357 size = (S32)strlen(data->mString) + 1; 357 size = (S32)strlen(data->mString) + 1; /*Flawfinder: ignore*/
358 } 358 }
359 else 359 else
360 { 360 {
@@ -365,7 +365,7 @@ S32 lsa_create_data_block(U8 **buffer, LLScriptLibData *data, S32 base_offset)
365 { 365 {
366 if (data->mKey) 366 if (data->mKey)
367 { 367 {
368 size = (S32)strlen(data->mKey) + 1; 368 size = (S32)strlen(data->mKey) + 1; /*Flawfinder: ignore*/
369 } 369 }
370 else 370 else
371 { 371 {
@@ -432,8 +432,12 @@ S32 lsa_create_data_block(U8 **buffer, LLScriptLibData *data, S32 base_offset)
432 if (listsize) 432 if (listsize)
433 { 433 {
434 U8 *tbuff = new U8[size + listsize]; 434 U8 *tbuff = new U8[size + listsize];
435 memcpy(tbuff, *buffer, size); 435 if (tbuff == NULL)
436 memcpy(tbuff + size, listbuf, listsize); 436 {
437 llerrs << "Memory Allocation Failed" << llendl;
438 }
439 memcpy(tbuff, *buffer, size); /*Flawfinder: ignore*/
440 memcpy(tbuff + size, listbuf, listsize); /*Flawfinder: ignore*/
437 size += listsize; 441 size += listsize;
438 delete [] *buffer; 442 delete [] *buffer;
439 delete [] listbuf; 443 delete [] listbuf;
@@ -516,7 +520,7 @@ void lsa_decrease_ref_count(U8 *buffer, S32 offset)
516 alloc_entry2bytestream(buffer, orig_offset, entry); 520 alloc_entry2bytestream(buffer, orig_offset, entry);
517} 521}
518 522
519char gLSAStringRead[16384]; 523char gLSAStringRead[16384]; /*Flawfinder: ignore*/
520 524
521 525
522LLScriptLibData *lsa_get_data(U8 *buffer, S32 &offset, BOOL b_dec_ref) 526LLScriptLibData *lsa_get_data(U8 *buffer, S32 &offset, BOOL b_dec_ref)
@@ -557,13 +561,13 @@ LLScriptLibData *lsa_get_data(U8 *buffer, S32 &offset, BOOL b_dec_ref)
557 break; 561 break;
558 case LST_KEY: 562 case LST_KEY:
559 bytestream2char(gLSAStringRead, buffer, offset); 563 bytestream2char(gLSAStringRead, buffer, offset);
560 retval->mKey = new char[strlen(gLSAStringRead) + 1]; 564 retval->mKey = new char[strlen(gLSAStringRead) + 1]; /*Flawfinder: ignore*/
561 strcpy(retval->mKey, gLSAStringRead); 565 strcpy(retval->mKey, gLSAStringRead); /*Flawfinder: ignore*/
562 break; 566 break;
563 case LST_STRING: 567 case LST_STRING:
564 bytestream2char(gLSAStringRead, buffer, offset); 568 bytestream2char(gLSAStringRead, buffer, offset);
565 retval->mString = new char[strlen(gLSAStringRead) + 1]; 569 retval->mString = new char[strlen(gLSAStringRead) + 1]; /*Flawfinder: ignore*/
566 strcpy(retval->mString, gLSAStringRead); 570 strcpy(retval->mString, gLSAStringRead); /*Flawfinder: ignore*/
567 break; 571 break;
568 case LST_VECTOR: 572 case LST_VECTOR:
569 bytestream2vector(retval->mVec, buffer, offset); 573 bytestream2vector(retval->mVec, buffer, offset);
@@ -703,13 +707,13 @@ S32 lsa_cat_strings(U8 *buffer, S32 offset1, S32 offset2, S32 heapsize)
703 return 0; 707 return 0;
704 } 708 }
705 709
706 S32 size = (S32)strlen(test1) + (S32)strlen(test2) + 1; 710 S32 size = (S32)strlen(test1) + (S32)strlen(test2) + 1; /*Flawfinder: ignore*/
707 711
708 LLScriptLibData *string3 = new LLScriptLibData; 712 LLScriptLibData *string3 = new LLScriptLibData;
709 string3->mType = LST_STRING; 713 string3->mType = LST_STRING;
710 string3->mString = new char[size]; 714 string3->mString = new char[size];
711 strcpy(string3->mString, test1); 715 strcpy(string3->mString, test1); /*Flawfinder: ignore*/
712 strcat(string3->mString, test2); 716 strcat(string3->mString, test2); /*Flawfinder: ignore*/
713 717
714 delete string1; 718 delete string1;
715 delete string2; 719 delete string2;
@@ -779,7 +783,7 @@ void lsa_print_heap(U8 *buffer)
779 F32 fpvalue; 783 F32 fpvalue;
780 LLVector3 vvalue; 784 LLVector3 vvalue;
781 LLQuaternion qvalue; 785 LLQuaternion qvalue;
782 char string[4096]; 786 char string[4096]; /*Flawfinder: ignore*/
783 787
784 LLScriptAllocEntry entry; 788 LLScriptAllocEntry entry;
785 789
@@ -849,7 +853,7 @@ void lsa_fprint_heap(U8 *buffer, FILE *fp)
849 F32 fpvalue; 853 F32 fpvalue;
850 LLVector3 vvalue; 854 LLVector3 vvalue;
851 LLQuaternion qvalue; 855 LLQuaternion qvalue;
852 char string[4096]; 856 char string[4096]; /*Flawfinder: ignore*/
853 857
854 LLScriptAllocEntry entry; 858 LLScriptAllocEntry entry;
855 859
@@ -997,58 +1001,9 @@ S32 lsa_cmp_lists(U8 *buffer, S32 offset1, S32 offset2)
997 1001
998 S32 length1 = list1->getListLength(); 1002 S32 length1 = list1->getListLength();
999 S32 length2 = list2->getListLength(); 1003 S32 length2 = list2->getListLength();
1000
1001 if (length1 != length2)
1002 {
1003 return length1 - length2;
1004 }
1005
1006 LLScriptLibData *runner1 = list1;
1007 LLScriptLibData *runner2 = list2;
1008
1009 S32 count = 0;
1010
1011 while (runner1)
1012 {
1013 if (runner1->mType != runner2->mType)
1014 return count;
1015
1016 switch(runner1->mType)
1017 {
1018 case LST_INTEGER:
1019 if (runner1->mInteger != runner2->mInteger)
1020 return count;
1021 break;
1022 case LST_FLOATINGPOINT:
1023 if (runner1->mFP != runner2->mFP)
1024 return count;
1025 break;
1026 case LST_KEY:
1027 if (strcmp(runner1->mKey, runner2->mKey))
1028 return count;
1029 break;
1030 case LST_STRING:
1031 if (strcmp(runner1->mString, runner2->mString))
1032 return count;
1033 break;
1034 case LST_VECTOR:
1035 if (runner1->mVec != runner2->mVec)
1036 return count;
1037 case LST_QUATERNION:
1038 if (runner1->mQuat != runner2->mQuat)
1039 return count;
1040 break;
1041 default:
1042 break;
1043 }
1044
1045 runner1 = runner1->mListp;
1046 runner2 = runner2->mListp;
1047 }
1048
1049 delete list1; 1004 delete list1;
1050 delete list2; 1005 delete list2;
1051 return 0; 1006 return length1 - length2;
1052} 1007}
1053 1008
1054 1009
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index 1b92608..7263ec3 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -119,7 +119,7 @@ void LLScriptLibrary::init()
119 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetTexture", NULL, "si", "llSetTexture(string texture, integer face)\nsets the texture of face")); 119 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetTexture", NULL, "si", "llSetTexture(string texture, integer face)\nsets the texture of face"));
120 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llScaleTexture", NULL, "ffi", "llScaleTexture(float scales, float scalet, integer face)\nsets the texture s, t scales for the chosen face")); 120 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llScaleTexture", NULL, "ffi", "llScaleTexture(float scales, float scalet, integer face)\nsets the texture s, t scales for the chosen face"));
121 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llOffsetTexture", NULL, "ffi", "llOffsetTexture(float offsets, float offsett, integer face)\nsets the texture s, t offsets for the chosen face")); 121 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llOffsetTexture", NULL, "ffi", "llOffsetTexture(float offsets, float offsett, integer face)\nsets the texture s, t offsets for the chosen face"));
122 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llRotateTexture", NULL, "fi", "llOffsetTexture(float rotation, integer face)\nsets the texture rotation for the chosen face")); 122 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llRotateTexture", NULL, "fi", "llRotateTexture(float rotation, integer face)\nsets the texture rotation for the chosen face"));
123 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetTexture", "s", "i", "string llGetTexture(integer face)\ngets the texture of face (if it's a texture in the object inventory, otherwise the key in a string)")); 123 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetTexture", "s", "i", "string llGetTexture(integer face)\ngets the texture of face (if it's a texture in the object inventory, otherwise the key in a string)"));
124 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetPos", NULL, "v", "llSetPos(vector pos)\nsets the position (if the script isn't physical)")); 124 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetPos", NULL, "v", "llSetPos(vector pos)\nsets the position (if the script isn't physical)"));
125 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetPos", "v", NULL, "vector llGetPos()\ngets the position (if the script isn't physical)")); 125 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetPos", "v", NULL, "vector llGetPos()\ngets the position (if the script isn't physical)"));
@@ -416,7 +416,14 @@ void LLScriptLibrary::init()
416 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelPrimCount", "i", "vii","integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)\nGets the number of prims on the parcel of the given category.\nCategories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP.")); 416 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelPrimCount", "i", "vii","integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)\nGets the number of prims on the parcel of the given category.\nCategories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP."));
417 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelMaxPrims", "i", "vi","integer llGetParcelMaxPrims(vector pos, integer sim_wide)\nGets the maximum number of prims allowed on the parcel at pos.")); 417 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelMaxPrims", "i", "vi","integer llGetParcelMaxPrims(vector pos, integer sim_wide)\nGets the maximum number of prims allowed on the parcel at pos."));
418 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelDetails", "l", "vl","list llGetParcelDetails(vector pos, list params)\nGets the parcel details specified in params for the parcel at pos.\nParams is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA")); 418 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelDetails", "l", "vl","list llGetParcelDetails(vector pos, list params)\nGets the parcel details specified in params for the parcel at pos.\nParams is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA"));
419
420
421 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLinkPrimitiveParams", NULL, "il", "llSetLinkPrimitiveParams(integer linknumber, list rules)\nSet primitive parameters for linknumber based on rules."));
422 addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLinkTexture", NULL, "isi", "llSetLinkTexture(integer link_pos, string texture, integer face)\nSets the texture of face for link_pos"));
423
419 424
425 addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llStringTrim", "s", "si", "string llStringTrim(string src, integer trim_type)\nTrim leading and/or trailing spaces from a string.\nUses trim_type of STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL."));
426
420 // energy, sleep, dummy_func, name, return type, parameters, help text, gods-only 427 // energy, sleep, dummy_func, name, return type, parameters, help text, gods-only
421 428
422 // IF YOU ADD NEW SCRIPT CALLS, YOU MUST PUT THEM AT THE END OF THIS LIST. 429 // IF YOU ADD NEW SCRIPT CALLS, YOU MUST PUT THEM AT THE END OF THIS LIST.
@@ -440,10 +447,6 @@ void LLScriptLibrary::init()
440 //addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamPositionLocked", NULL, "i", "llSetCamPositionLocked(TRUE or FALSE)\nLocks the camera position so it will not move")); 447 //addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamPositionLocked", NULL, "i", "llSetCamPositionLocked(TRUE or FALSE)\nLocks the camera position so it will not move"));
441 //addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamFocusLocked", NULL, "i", "llSetCamFocusLocked(TRUE or FALSE)\nLocks the camera focus so it will not move")); 448 //addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCamFocusLocked", NULL, "i", "llSetCamFocusLocked(TRUE or FALSE)\nLocks the camera focus so it will not move"));
442 449
443// These functions are being put on hold until we think through how we want them handled (security issues). DK 02/16/05
444 //addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLinkPrimitiveParams", NULL, "il", "llSetLinkPrimitiveParams(integer linknumber, list rules)\nSet primitive parameters for linknumber based on rules."));
445 //addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLinkTexture", NULL, "isi", "llSetLinkTexture(integer link_pos, string texture, integer face)\nSets the texture of face for link_pos"));
446
447 //addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetForSale", "i", "ii", "integer llSetForSale(integer selltype, integer price)\nSets this object for sale in mode selltype for price. Returns TRUE if successfully set for sale.")); 450 //addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetForSale", "i", "ii", "integer llSetForSale(integer selltype, integer price)\nSets this object for sale in mode selltype for price. Returns TRUE if successfully set for sale."));
448 451
449LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), char *name, char *ret_type, char *args, char *desc, BOOL god_only) 452LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), char *name, char *ret_type, char *args, char *desc, BOOL god_only)
@@ -452,11 +455,17 @@ LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_fun
452 mDesc = new char[512]; 455 mDesc = new char[512];
453 if (mSleepTime) 456 if (mSleepTime)
454 { 457 {
455 sprintf(mDesc,"%s\nSleeps script for %.1f seconds.",desc,mSleepTime); 458 snprintf( /* Flawfinder: ignore */
459 mDesc,
460 512,
461 "%s\nSleeps script for %.1f seconds.",
462 desc,
463 mSleepTime);
456 } 464 }
457 else 465 else
458 { 466 {
459 strcpy(mDesc,desc); 467 strncpy(mDesc, desc, 512); /* Flawfinder: ignore */
468 mDesc[511] = '\0'; // just in case.
460 } 469 }
461} 470}
462 471
@@ -470,7 +479,10 @@ void LLScriptLibrary::addFunction(LLScriptLibraryFunction *func)
470 LLScriptLibraryFunction **temp = new LLScriptLibraryFunction*[mNextNumber + 1]; 479 LLScriptLibraryFunction **temp = new LLScriptLibraryFunction*[mNextNumber + 1];
471 if (mNextNumber) 480 if (mNextNumber)
472 { 481 {
473 memcpy(temp, mFunctions, sizeof(LLScriptLibraryFunction *)*mNextNumber); 482 memcpy( /* Flawfinder: ignore */
483 temp,
484 mFunctions,
485 sizeof(LLScriptLibraryFunction*)*mNextNumber);
474 delete [] mFunctions; 486 delete [] mFunctions;
475 } 487 }
476 mFunctions = temp; 488 mFunctions = temp;
@@ -492,7 +504,7 @@ void LLScriptLibrary::assignExec(char *name, void (*exec_func)(LLScriptLibData *
492 504
493void LLScriptLibData::print(std::ostream &s, BOOL b_prepend_comma) 505void LLScriptLibData::print(std::ostream &s, BOOL b_prepend_comma)
494{ 506{
495 char tmp[1024]; 507 char tmp[1024]; /*Flawfinder: ignore*/
496 if (b_prepend_comma) 508 if (b_prepend_comma)
497 { 509 {
498 s << ", "; 510 s << ", ";
@@ -503,7 +515,7 @@ void LLScriptLibData::print(std::ostream &s, BOOL b_prepend_comma)
503 s << mInteger; 515 s << mInteger;
504 break; 516 break;
505 case LST_FLOATINGPOINT: 517 case LST_FLOATINGPOINT:
506 snprintf(tmp, 1024, "%f", mFP); 518 snprintf(tmp, 1024, "%f", mFP); /*Flawfinder: ignore*/
507 s << tmp; 519 s << tmp;
508 break; 520 break;
509 case LST_KEY: 521 case LST_KEY:
@@ -513,12 +525,12 @@ void LLScriptLibData::print(std::ostream &s, BOOL b_prepend_comma)
513 s << mString; 525 s << mString;
514 break; 526 break;
515 case LST_VECTOR: 527 case LST_VECTOR:
516 snprintf(tmp, 1024, "<%f, %f, %f>", mVec.mV[VX], 528 snprintf(tmp, 1024, "<%f, %f, %f>", mVec.mV[VX], /* Flawfinder: ignore */
517 mVec.mV[VY], mVec.mV[VZ]); 529 mVec.mV[VY], mVec.mV[VZ]);
518 s << tmp; 530 s << tmp;
519 break; 531 break;
520 case LST_QUATERNION: 532 case LST_QUATERNION:
521 snprintf(tmp, 1024, "<%f, %f, %f, %f>", mQuat.mQ[VX], mQuat.mQ[VY], 533 snprintf(tmp, 1024, "<%f, %f, %f, %f>", mQuat.mQ[VX], mQuat.mQ[VY], /* Flawfinder: ignore */
522 mQuat.mQ[VZ], mQuat.mQ[VS]); 534 mQuat.mQ[VZ], mQuat.mQ[VS]);
523 s << tmp; 535 s << tmp;
524 break; 536 break;
@@ -536,7 +548,7 @@ void LLScriptLibData::print_separator(std::ostream& ostr, BOOL b_prepend_sep, ch
536 //print(ostr, FALSE); 548 //print(ostr, FALSE);
537 { 549 {
538 BOOL b_prepend_comma = FALSE; 550 BOOL b_prepend_comma = FALSE;
539 char tmp[1024]; 551 char tmp[1024]; /* Flawfinder: ignore */
540 if (b_prepend_comma) 552 if (b_prepend_comma)
541 { 553 {
542 ostr << ", "; 554 ostr << ", ";
@@ -547,7 +559,7 @@ void LLScriptLibData::print_separator(std::ostream& ostr, BOOL b_prepend_sep, ch
547 ostr << mInteger; 559 ostr << mInteger;
548 break; 560 break;
549 case LST_FLOATINGPOINT: 561 case LST_FLOATINGPOINT:
550 snprintf(tmp, 1024, "%f", mFP); 562 snprintf(tmp, 1024, "%f", mFP); /* Flawfinder: ignore */
551 ostr << tmp; 563 ostr << tmp;
552 break; 564 break;
553 case LST_KEY: 565 case LST_KEY:
@@ -557,12 +569,12 @@ void LLScriptLibData::print_separator(std::ostream& ostr, BOOL b_prepend_sep, ch
557 ostr << mString; 569 ostr << mString;
558 break; 570 break;
559 case LST_VECTOR: 571 case LST_VECTOR:
560 snprintf(tmp, 1024, "<%f, %f, %f>", mVec.mV[VX], 572 snprintf(tmp, 1024, "<%f, %f, %f>", mVec.mV[VX], /* Flawfinder: ignore */
561 mVec.mV[VY], mVec.mV[VZ]); 573 mVec.mV[VY], mVec.mV[VZ]);
562 ostr << tmp; 574 ostr << tmp;
563 break; 575 break;
564 case LST_QUATERNION: 576 case LST_QUATERNION:
565 snprintf(tmp, 1024, "<%f, %f, %f, %f>", mQuat.mQ[VX], mQuat.mQ[VY], 577 snprintf(tmp, 1024, "<%f, %f, %f, %f>", mQuat.mQ[VX], mQuat.mQ[VY], /* Flawfinder: ignore */
566 mQuat.mQ[VZ], mQuat.mQ[VS]); 578 mQuat.mQ[VZ], mQuat.mQ[VS]);
567 ostr << tmp; 579 ostr << tmp;
568 break; 580 break;
diff --git a/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj b/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj
new file mode 100644
index 0000000..ee92752
--- /dev/null
+++ b/linden/indra/lscript/lscript_library/lscript_library_vc8.vcproj
@@ -0,0 +1,268 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="8.00"
5 Name="lscript_library"
6 ProjectGUID="{BFA102B0-C891-4E13-B1CF-C2F28073DA8E}"
7 Keyword="Win32Proj"
8 >
9 <Platforms>
10 <Platform
11 Name="Win32"
12 />
13 </Platforms>
14 <ToolFiles>
15 </ToolFiles>
16 <Configurations>
17 <Configuration
18 Name="Debug|Win32"
19 OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
20 IntermediateDirectory="Debug"
21 ConfigurationType="4"
22 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
23 CharacterSet="1"
24 >
25 <Tool
26 Name="VCPreBuildEventTool"
27 />
28 <Tool
29 Name="VCCustomBuildTool"
30 />
31 <Tool
32 Name="VCXMLDataGeneratorTool"
33 />
34 <Tool
35 Name="VCWebServiceProxyGeneratorTool"
36 />
37 <Tool
38 Name="VCMIDLTool"
39 />
40 <Tool
41 Name="VCCLCompilerTool"
42 Optimization="0"
43 AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
44 PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
45 MinimalRebuild="true"
46 BasicRuntimeChecks="3"
47 RuntimeLibrary="1"
48 StructMemberAlignment="4"
49 TreatWChar_tAsBuiltInType="false"
50 ForceConformanceInForLoopScope="true"
51 UsePrecompiledHeader="0"
52 WarningLevel="3"
53 WarnAsError="true"
54 Detect64BitPortabilityProblems="false"
55 DebugInformationFormat="4"
56 />
57 <Tool
58 Name="VCManagedResourceCompilerTool"
59 />
60 <Tool
61 Name="VCResourceCompilerTool"
62 />
63 <Tool
64 Name="VCPreLinkEventTool"
65 />
66 <Tool
67 Name="VCLibrarianTool"
68 OutputFile="$(OutDir)/lscript_library.lib"
69 />
70 <Tool
71 Name="VCALinkTool"
72 />
73 <Tool
74 Name="VCXDCMakeTool"
75 />
76 <Tool
77 Name="VCBscMakeTool"
78 />
79 <Tool
80 Name="VCFxCopTool"
81 />
82 <Tool
83 Name="VCPostBuildEventTool"
84 />
85 </Configuration>
86 <Configuration
87 Name="Release|Win32"
88 OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
89 IntermediateDirectory="Release"
90 ConfigurationType="4"
91 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
92 CharacterSet="1"
93 >
94 <Tool
95 Name="VCPreBuildEventTool"
96 />
97 <Tool
98 Name="VCCustomBuildTool"
99 />
100 <Tool
101 Name="VCXMLDataGeneratorTool"
102 />
103 <Tool
104 Name="VCWebServiceProxyGeneratorTool"
105 />
106 <Tool
107 Name="VCMIDLTool"
108 />
109 <Tool
110 Name="VCCLCompilerTool"
111 AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
112 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
113 RuntimeLibrary="0"
114 StructMemberAlignment="0"
115 TreatWChar_tAsBuiltInType="false"
116 ForceConformanceInForLoopScope="true"
117 UsePrecompiledHeader="0"
118 WarningLevel="3"
119 WarnAsError="true"
120 Detect64BitPortabilityProblems="false"
121 DebugInformationFormat="3"
122 />
123 <Tool
124 Name="VCManagedResourceCompilerTool"
125 />
126 <Tool
127 Name="VCResourceCompilerTool"
128 />
129 <Tool
130 Name="VCPreLinkEventTool"
131 />
132 <Tool
133 Name="VCLibrarianTool"
134 OutputFile="$(OutDir)/lscript_library.lib"
135 />
136 <Tool
137 Name="VCALinkTool"
138 />
139 <Tool
140 Name="VCXDCMakeTool"
141 />
142 <Tool
143 Name="VCBscMakeTool"
144 />
145 <Tool
146 Name="VCFxCopTool"
147 />
148 <Tool
149 Name="VCPostBuildEventTool"
150 />
151 </Configuration>
152 <Configuration
153 Name="ReleaseNoOpt|Win32"
154 OutputDirectory="../../lib_$(ConfigurationName)/i686-win32"
155 IntermediateDirectory="$(ConfigurationName)"
156 ConfigurationType="4"
157 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
158 CharacterSet="1"
159 >
160 <Tool
161 Name="VCPreBuildEventTool"
162 />
163 <Tool
164 Name="VCCustomBuildTool"
165 />
166 <Tool
167 Name="VCXMLDataGeneratorTool"
168 />
169 <Tool
170 Name="VCWebServiceProxyGeneratorTool"
171 />
172 <Tool
173 Name="VCMIDLTool"
174 />
175 <Tool
176 Name="VCCLCompilerTool"
177 Optimization="0"
178 AdditionalIncludeDirectories="..\;..\..\llmath;..\..\llcommon;&quot;..\..\..\libraries\i686-win32&quot;;..\..\..\libraries\include"
179 PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
180 RuntimeLibrary="0"
181 StructMemberAlignment="0"
182 TreatWChar_tAsBuiltInType="false"
183 ForceConformanceInForLoopScope="true"
184 UsePrecompiledHeader="0"
185 WarningLevel="3"
186 WarnAsError="true"
187 Detect64BitPortabilityProblems="false"
188 DebugInformationFormat="3"
189 />
190 <Tool
191 Name="VCManagedResourceCompilerTool"
192 />
193 <Tool
194 Name="VCResourceCompilerTool"
195 />
196 <Tool
197 Name="VCPreLinkEventTool"
198 />
199 <Tool
200 Name="VCLibrarianTool"
201 OutputFile="$(OutDir)/lscript_library.lib"
202 />
203 <Tool
204 Name="VCALinkTool"
205 />
206 <Tool
207 Name="VCXDCMakeTool"
208 />
209 <Tool
210 Name="VCBscMakeTool"
211 />
212 <Tool
213 Name="VCFxCopTool"
214 />
215 <Tool
216 Name="VCPostBuildEventTool"
217 />
218 </Configuration>
219 </Configurations>
220 <References>
221 </References>
222 <Files>
223 <Filter
224 Name="Source Files"
225 Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
226 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
227 >
228 <File
229 RelativePath=".\lscript_alloc.cpp"
230 >
231 </File>
232 <File
233 RelativePath=".\lscript_export.cpp"
234 >
235 </File>
236 <File
237 RelativePath=".\lscript_library.cpp"
238 >
239 </File>
240 </Filter>
241 <Filter
242 Name="Header Files"
243 Filter="h;hpp;hxx;hm;inl;inc;xsd"
244 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
245 >
246 <File
247 RelativePath="..\lscript_alloc.h"
248 >
249 </File>
250 <File
251 RelativePath="..\lscript_export.h"
252 >
253 </File>
254 <File
255 RelativePath="..\lscript_library.h"
256 >
257 </File>
258 </Filter>
259 <Filter
260 Name="Resource Files"
261 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
262 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
263 >
264 </Filter>
265 </Files>
266 <Globals>
267 </Globals>
268</VisualStudioProject>