diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/llprimitive | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/llprimitive')
-rw-r--r-- | linden/indra/llprimitive/llmaterialtable.cpp | 104 | ||||
-rw-r--r-- | linden/indra/llprimitive/llmaterialtable.h | 4 | ||||
-rw-r--r-- | linden/indra/llprimitive/llprimitive_vc8.vcproj | 638 | ||||
-rw-r--r-- | linden/indra/llprimitive/llprimitive_vc9.vcproj | 640 | ||||
-rw-r--r-- | linden/indra/llprimitive/lltextureentry.cpp | 1 |
5 files changed, 694 insertions, 693 deletions
diff --git a/linden/indra/llprimitive/llmaterialtable.cpp b/linden/indra/llprimitive/llmaterialtable.cpp index ee088d0..537c968 100644 --- a/linden/indra/llprimitive/llmaterialtable.cpp +++ b/linden/indra/llprimitive/llmaterialtable.cpp | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "linden_common.h" | 32 | #include "linden_common.h" |
33 | 33 | ||
34 | #include "llmaterialtable.h" | 34 | #include "llmaterialtable.h" |
35 | #include "llstl.h" | ||
35 | #include "material_codes.h" | 36 | #include "material_codes.h" |
36 | #include "sound_ids.h" | 37 | #include "sound_ids.h" |
37 | #include "imageids.h" | 38 | #include "imageids.h" |
@@ -70,7 +71,8 @@ LLMaterialTable::~LLMaterialTable() | |||
70 | mRollingSoundMatrix = NULL; | 71 | mRollingSoundMatrix = NULL; |
71 | } | 72 | } |
72 | 73 | ||
73 | mMaterialInfoList.deleteAllData(); | 74 | for_each(mMaterialInfoList.begin(), mMaterialInfoList.end(), DeletePointer()); |
75 | mMaterialInfoList.clear(); | ||
74 | } | 76 | } |
75 | 77 | ||
76 | void LLMaterialTable::initBasicTable() | 78 | void LLMaterialTable::initBasicTable() |
@@ -290,7 +292,7 @@ BOOL LLMaterialTable::add(U8 mcode, char* name, const LLUUID &uuid) | |||
290 | 292 | ||
291 | // Add at the end so the order in menus matches the order in this | 293 | // Add at the end so the order in menus matches the order in this |
292 | // file. JNC 11.30.01 | 294 | // file. JNC 11.30.01 |
293 | mMaterialInfoList.addDataAtEnd(infop); | 295 | mMaterialInfoList.push_back(infop); |
294 | 296 | ||
295 | return TRUE; | 297 | return TRUE; |
296 | } | 298 | } |
@@ -336,10 +338,10 @@ BOOL LLMaterialTable::addRollingSound(U8 mcode, U8 mcode2, const LLUUID &uuid) | |||
336 | 338 | ||
337 | BOOL LLMaterialTable::addShatterSound(U8 mcode, const LLUUID &uuid) | 339 | BOOL LLMaterialTable::addShatterSound(U8 mcode, const LLUUID &uuid) |
338 | { | 340 | { |
339 | LLMaterialInfo *infop; | 341 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
340 | 342 | iter != mMaterialInfoList.end(); ++iter) | |
341 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | ||
342 | { | 343 | { |
344 | LLMaterialInfo *infop = *iter; | ||
343 | if (mcode == infop->mMCode) | 345 | if (mcode == infop->mMCode) |
344 | { | 346 | { |
345 | infop->mShatterSoundID = uuid; | 347 | infop->mShatterSoundID = uuid; |
@@ -352,10 +354,10 @@ BOOL LLMaterialTable::addShatterSound(U8 mcode, const LLUUID &uuid) | |||
352 | 354 | ||
353 | BOOL LLMaterialTable::addDensity(U8 mcode, const F32 &density) | 355 | BOOL LLMaterialTable::addDensity(U8 mcode, const F32 &density) |
354 | { | 356 | { |
355 | LLMaterialInfo *infop; | 357 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
356 | 358 | iter != mMaterialInfoList.end(); ++iter) | |
357 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | ||
358 | { | 359 | { |
360 | LLMaterialInfo *infop = *iter; | ||
359 | if (mcode == infop->mMCode) | 361 | if (mcode == infop->mMCode) |
360 | { | 362 | { |
361 | infop->mDensity = density; | 363 | infop->mDensity = density; |
@@ -368,10 +370,10 @@ BOOL LLMaterialTable::addDensity(U8 mcode, const F32 &density) | |||
368 | 370 | ||
369 | BOOL LLMaterialTable::addRestitution(U8 mcode, const F32 &restitution) | 371 | BOOL LLMaterialTable::addRestitution(U8 mcode, const F32 &restitution) |
370 | { | 372 | { |
371 | LLMaterialInfo *infop; | 373 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
372 | 374 | iter != mMaterialInfoList.end(); ++iter) | |
373 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | ||
374 | { | 375 | { |
376 | LLMaterialInfo *infop = *iter; | ||
375 | if (mcode == infop->mMCode) | 377 | if (mcode == infop->mMCode) |
376 | { | 378 | { |
377 | infop->mRestitution = restitution; | 379 | infop->mRestitution = restitution; |
@@ -384,10 +386,10 @@ BOOL LLMaterialTable::addRestitution(U8 mcode, const F32 &restitution) | |||
384 | 386 | ||
385 | BOOL LLMaterialTable::addFriction(U8 mcode, const F32 &friction) | 387 | BOOL LLMaterialTable::addFriction(U8 mcode, const F32 &friction) |
386 | { | 388 | { |
387 | LLMaterialInfo *infop; | 389 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
388 | 390 | iter != mMaterialInfoList.end(); ++iter) | |
389 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | ||
390 | { | 391 | { |
392 | LLMaterialInfo *infop = *iter; | ||
391 | if (mcode == infop->mMCode) | 393 | if (mcode == infop->mMCode) |
392 | { | 394 | { |
393 | infop->mFriction = friction; | 395 | infop->mFriction = friction; |
@@ -400,10 +402,10 @@ BOOL LLMaterialTable::addFriction(U8 mcode, const F32 &friction) | |||
400 | 402 | ||
401 | BOOL LLMaterialTable::addDamageAndEnergy(U8 mcode, const F32 &hp_mod, const F32 &damage_mod, const F32 &ep_mod) | 403 | BOOL LLMaterialTable::addDamageAndEnergy(U8 mcode, const F32 &hp_mod, const F32 &damage_mod, const F32 &ep_mod) |
402 | { | 404 | { |
403 | LLMaterialInfo *infop; | 405 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
404 | 406 | iter != mMaterialInfoList.end(); ++iter) | |
405 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | ||
406 | { | 407 | { |
408 | LLMaterialInfo *infop = *iter; | ||
407 | if (mcode == infop->mMCode) | 409 | if (mcode == infop->mMCode) |
408 | { | 410 | { |
409 | infop->mHPModifier = hp_mod; | 411 | infop->mHPModifier = hp_mod; |
@@ -418,10 +420,10 @@ BOOL LLMaterialTable::addDamageAndEnergy(U8 mcode, const F32 &hp_mod, const F32 | |||
418 | 420 | ||
419 | LLUUID LLMaterialTable::getDefaultTextureID(char* name) | 421 | LLUUID LLMaterialTable::getDefaultTextureID(char* name) |
420 | { | 422 | { |
421 | LLMaterialInfo *infop; | 423 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
422 | 424 | iter != mMaterialInfoList.end(); ++iter) | |
423 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | ||
424 | { | 425 | { |
426 | LLMaterialInfo *infop = *iter; | ||
425 | if (!strcmp(name, infop->mName)) | 427 | if (!strcmp(name, infop->mName)) |
426 | { | 428 | { |
427 | return infop->mDefaultTextureID; | 429 | return infop->mDefaultTextureID; |
@@ -434,12 +436,11 @@ LLUUID LLMaterialTable::getDefaultTextureID(char* name) | |||
434 | 436 | ||
435 | LLUUID LLMaterialTable::getDefaultTextureID(U8 mcode) | 437 | LLUUID LLMaterialTable::getDefaultTextureID(U8 mcode) |
436 | { | 438 | { |
437 | LLMaterialInfo *infop; | ||
438 | |||
439 | mcode &= LL_MCODE_MASK; | 439 | mcode &= LL_MCODE_MASK; |
440 | 440 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); | |
441 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | 441 | iter != mMaterialInfoList.end(); ++iter) |
442 | { | 442 | { |
443 | LLMaterialInfo *infop = *iter; | ||
443 | if (mcode == infop->mMCode) | 444 | if (mcode == infop->mMCode) |
444 | { | 445 | { |
445 | return infop->mDefaultTextureID; | 446 | return infop->mDefaultTextureID; |
@@ -452,10 +453,10 @@ LLUUID LLMaterialTable::getDefaultTextureID(U8 mcode) | |||
452 | 453 | ||
453 | U8 LLMaterialTable::getMCode(const char* name) | 454 | U8 LLMaterialTable::getMCode(const char* name) |
454 | { | 455 | { |
455 | LLMaterialInfo *infop; | 456 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
456 | 457 | iter != mMaterialInfoList.end(); ++iter) | |
457 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | ||
458 | { | 458 | { |
459 | LLMaterialInfo *infop = *iter; | ||
459 | if (!strcmp(name, infop->mName)) | 460 | if (!strcmp(name, infop->mName)) |
460 | { | 461 | { |
461 | return infop->mMCode; | 462 | return infop->mMCode; |
@@ -468,12 +469,11 @@ U8 LLMaterialTable::getMCode(const char* name) | |||
468 | 469 | ||
469 | char* LLMaterialTable::getName(U8 mcode) | 470 | char* LLMaterialTable::getName(U8 mcode) |
470 | { | 471 | { |
471 | LLMaterialInfo *infop; | ||
472 | |||
473 | mcode &= LL_MCODE_MASK; | 472 | mcode &= LL_MCODE_MASK; |
474 | 473 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); | |
475 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | 474 | iter != mMaterialInfoList.end(); ++iter) |
476 | { | 475 | { |
476 | LLMaterialInfo *infop = *iter; | ||
477 | if (mcode == infop->mMCode) | 477 | if (mcode == infop->mMCode) |
478 | { | 478 | { |
479 | return infop->mName; | 479 | return infop->mName; |
@@ -569,11 +569,11 @@ LLUUID LLMaterialTable::getGroundCollisionParticleUUID(U8 mcode) | |||
569 | 569 | ||
570 | F32 LLMaterialTable::getDensity(U8 mcode) | 570 | F32 LLMaterialTable::getDensity(U8 mcode) |
571 | { | 571 | { |
572 | LLMaterialInfo *infop; | ||
573 | |||
574 | mcode &= LL_MCODE_MASK; | 572 | mcode &= LL_MCODE_MASK; |
575 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | 573 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
574 | iter != mMaterialInfoList.end(); ++iter) | ||
576 | { | 575 | { |
576 | LLMaterialInfo *infop = *iter; | ||
577 | if (mcode == infop->mMCode) | 577 | if (mcode == infop->mMCode) |
578 | { | 578 | { |
579 | return infop->mDensity; | 579 | return infop->mDensity; |
@@ -585,11 +585,11 @@ F32 LLMaterialTable::getDensity(U8 mcode) | |||
585 | 585 | ||
586 | F32 LLMaterialTable::getRestitution(U8 mcode) | 586 | F32 LLMaterialTable::getRestitution(U8 mcode) |
587 | { | 587 | { |
588 | LLMaterialInfo *infop; | ||
589 | |||
590 | mcode &= LL_MCODE_MASK; | 588 | mcode &= LL_MCODE_MASK; |
591 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | 589 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
590 | iter != mMaterialInfoList.end(); ++iter) | ||
592 | { | 591 | { |
592 | LLMaterialInfo *infop = *iter; | ||
593 | if (mcode == infop->mMCode) | 593 | if (mcode == infop->mMCode) |
594 | { | 594 | { |
595 | return infop->mRestitution; | 595 | return infop->mRestitution; |
@@ -601,11 +601,11 @@ F32 LLMaterialTable::getRestitution(U8 mcode) | |||
601 | 601 | ||
602 | F32 LLMaterialTable::getFriction(U8 mcode) | 602 | F32 LLMaterialTable::getFriction(U8 mcode) |
603 | { | 603 | { |
604 | LLMaterialInfo *infop; | ||
605 | |||
606 | mcode &= LL_MCODE_MASK; | 604 | mcode &= LL_MCODE_MASK; |
607 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | 605 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
606 | iter != mMaterialInfoList.end(); ++iter) | ||
608 | { | 607 | { |
608 | LLMaterialInfo *infop = *iter; | ||
609 | if (mcode == infop->mMCode) | 609 | if (mcode == infop->mMCode) |
610 | { | 610 | { |
611 | return infop->mFriction; | 611 | return infop->mFriction; |
@@ -617,11 +617,11 @@ F32 LLMaterialTable::getFriction(U8 mcode) | |||
617 | 617 | ||
618 | F32 LLMaterialTable::getHPMod(U8 mcode) | 618 | F32 LLMaterialTable::getHPMod(U8 mcode) |
619 | { | 619 | { |
620 | LLMaterialInfo *infop; | ||
621 | |||
622 | mcode &= LL_MCODE_MASK; | 620 | mcode &= LL_MCODE_MASK; |
623 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | 621 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
622 | iter != mMaterialInfoList.end(); ++iter) | ||
624 | { | 623 | { |
624 | LLMaterialInfo *infop = *iter; | ||
625 | if (mcode == infop->mMCode) | 625 | if (mcode == infop->mMCode) |
626 | { | 626 | { |
627 | return infop->mHPModifier; | 627 | return infop->mHPModifier; |
@@ -633,11 +633,11 @@ F32 LLMaterialTable::getHPMod(U8 mcode) | |||
633 | 633 | ||
634 | F32 LLMaterialTable::getDamageMod(U8 mcode) | 634 | F32 LLMaterialTable::getDamageMod(U8 mcode) |
635 | { | 635 | { |
636 | LLMaterialInfo *infop; | ||
637 | |||
638 | mcode &= LL_MCODE_MASK; | 636 | mcode &= LL_MCODE_MASK; |
639 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | 637 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
638 | iter != mMaterialInfoList.end(); ++iter) | ||
640 | { | 639 | { |
640 | LLMaterialInfo *infop = *iter; | ||
641 | if (mcode == infop->mMCode) | 641 | if (mcode == infop->mMCode) |
642 | { | 642 | { |
643 | return infop->mDamageModifier; | 643 | return infop->mDamageModifier; |
@@ -649,11 +649,11 @@ F32 LLMaterialTable::getDamageMod(U8 mcode) | |||
649 | 649 | ||
650 | F32 LLMaterialTable::getEPMod(U8 mcode) | 650 | F32 LLMaterialTable::getEPMod(U8 mcode) |
651 | { | 651 | { |
652 | LLMaterialInfo *infop; | ||
653 | |||
654 | mcode &= LL_MCODE_MASK; | 652 | mcode &= LL_MCODE_MASK; |
655 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | 653 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
654 | iter != mMaterialInfoList.end(); ++iter) | ||
656 | { | 655 | { |
656 | LLMaterialInfo *infop = *iter; | ||
657 | if (mcode == infop->mMCode) | 657 | if (mcode == infop->mMCode) |
658 | { | 658 | { |
659 | return infop->mEPModifier; | 659 | return infop->mEPModifier; |
@@ -665,11 +665,11 @@ F32 LLMaterialTable::getEPMod(U8 mcode) | |||
665 | 665 | ||
666 | LLUUID LLMaterialTable::getShatterSoundUUID(U8 mcode) | 666 | LLUUID LLMaterialTable::getShatterSoundUUID(U8 mcode) |
667 | { | 667 | { |
668 | LLMaterialInfo *infop; | ||
669 | |||
670 | mcode &= LL_MCODE_MASK; | 668 | mcode &= LL_MCODE_MASK; |
671 | for (infop = mMaterialInfoList.getFirstData(); infop != NULL; infop = mMaterialInfoList.getNextData() ) | 669 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
670 | iter != mMaterialInfoList.end(); ++iter) | ||
672 | { | 671 | { |
672 | LLMaterialInfo *infop = *iter; | ||
673 | if (mcode == infop->mMCode) | 673 | if (mcode == infop->mMCode) |
674 | { | 674 | { |
675 | return infop->mShatterSoundID; | 675 | return infop->mShatterSoundID; |
diff --git a/linden/indra/llprimitive/llmaterialtable.h b/linden/indra/llprimitive/llmaterialtable.h index b620238..b48c832 100644 --- a/linden/indra/llprimitive/llmaterialtable.h +++ b/linden/indra/llprimitive/llmaterialtable.h | |||
@@ -84,7 +84,9 @@ public: | |||
84 | class LLMaterialTable | 84 | class LLMaterialTable |
85 | { | 85 | { |
86 | public: | 86 | public: |
87 | LLLinkedList<LLMaterialInfo> mMaterialInfoList; | 87 | typedef std::list<LLMaterialInfo*> info_list_t; |
88 | info_list_t mMaterialInfoList; | ||
89 | |||
88 | LLUUID *mCollisionSoundMatrix; | 90 | LLUUID *mCollisionSoundMatrix; |
89 | LLUUID *mSlidingSoundMatrix; | 91 | LLUUID *mSlidingSoundMatrix; |
90 | LLUUID *mRollingSoundMatrix; | 92 | LLUUID *mRollingSoundMatrix; |
diff --git a/linden/indra/llprimitive/llprimitive_vc8.vcproj b/linden/indra/llprimitive/llprimitive_vc8.vcproj index a660023..860f88a 100644 --- a/linden/indra/llprimitive/llprimitive_vc8.vcproj +++ b/linden/indra/llprimitive/llprimitive_vc8.vcproj | |||
@@ -1,319 +1,319 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
2 | <VisualStudioProject | 2 | <VisualStudioProject |
3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
4 | Version="8.00" | 4 | Version="8.00" |
5 | Name="llprimitive" | 5 | Name="llprimitive" |
6 | ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}" | 6 | ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}" |
7 | RootNamespace="llprimitive" | 7 | RootNamespace="llprimitive" |
8 | Keyword="Win32Proj" | 8 | Keyword="Win32Proj" |
9 | > | 9 | > |
10 | <Platforms> | 10 | <Platforms> |
11 | <Platform | 11 | <Platform |
12 | Name="Win32" | 12 | Name="Win32" |
13 | /> | 13 | /> |
14 | </Platforms> | 14 | </Platforms> |
15 | <ToolFiles> | 15 | <ToolFiles> |
16 | </ToolFiles> | 16 | </ToolFiles> |
17 | <Configurations> | 17 | <Configurations> |
18 | <Configuration | 18 | <Configuration |
19 | Name="Debug|Win32" | 19 | Name="Debug|Win32" |
20 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | 20 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" |
21 | IntermediateDirectory="Debug" | 21 | IntermediateDirectory="Debug" |
22 | ConfigurationType="4" | 22 | ConfigurationType="4" |
23 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 23 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
24 | CharacterSet="1" | 24 | CharacterSet="1" |
25 | > | 25 | > |
26 | <Tool | 26 | <Tool |
27 | Name="VCPreBuildEventTool" | 27 | Name="VCPreBuildEventTool" |
28 | /> | 28 | /> |
29 | <Tool | 29 | <Tool |
30 | Name="VCCustomBuildTool" | 30 | Name="VCCustomBuildTool" |
31 | /> | 31 | /> |
32 | <Tool | 32 | <Tool |
33 | Name="VCXMLDataGeneratorTool" | 33 | Name="VCXMLDataGeneratorTool" |
34 | /> | 34 | /> |
35 | <Tool | 35 | <Tool |
36 | Name="VCWebServiceProxyGeneratorTool" | 36 | Name="VCWebServiceProxyGeneratorTool" |
37 | /> | 37 | /> |
38 | <Tool | 38 | <Tool |
39 | Name="VCMIDLTool" | 39 | Name="VCMIDLTool" |
40 | /> | 40 | /> |
41 | <Tool | 41 | <Tool |
42 | Name="VCCLCompilerTool" | 42 | Name="VCCLCompilerTool" |
43 | Optimization="0" | 43 | Optimization="0" |
44 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\" | 44 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\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" | 45 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG" |
46 | MinimalRebuild="true" | 46 | MinimalRebuild="true" |
47 | BasicRuntimeChecks="3" | 47 | BasicRuntimeChecks="3" |
48 | RuntimeLibrary="1" | 48 | RuntimeLibrary="1" |
49 | StructMemberAlignment="4" | 49 | StructMemberAlignment="4" |
50 | TreatWChar_tAsBuiltInType="false" | 50 | TreatWChar_tAsBuiltInType="false" |
51 | ForceConformanceInForLoopScope="true" | 51 | ForceConformanceInForLoopScope="true" |
52 | UsePrecompiledHeader="0" | 52 | UsePrecompiledHeader="0" |
53 | WarningLevel="3" | 53 | WarningLevel="3" |
54 | WarnAsError="true" | 54 | WarnAsError="true" |
55 | Detect64BitPortabilityProblems="false" | 55 | Detect64BitPortabilityProblems="false" |
56 | DebugInformationFormat="4" | 56 | DebugInformationFormat="4" |
57 | /> | 57 | /> |
58 | <Tool | 58 | <Tool |
59 | Name="VCManagedResourceCompilerTool" | 59 | Name="VCManagedResourceCompilerTool" |
60 | /> | 60 | /> |
61 | <Tool | 61 | <Tool |
62 | Name="VCResourceCompilerTool" | 62 | Name="VCResourceCompilerTool" |
63 | /> | 63 | /> |
64 | <Tool | 64 | <Tool |
65 | Name="VCPreLinkEventTool" | 65 | Name="VCPreLinkEventTool" |
66 | /> | 66 | /> |
67 | <Tool | 67 | <Tool |
68 | Name="VCLibrarianTool" | 68 | Name="VCLibrarianTool" |
69 | OutputFile="$(OutDir)/llprimitive.lib" | 69 | OutputFile="$(OutDir)/llprimitive.lib" |
70 | /> | 70 | /> |
71 | <Tool | 71 | <Tool |
72 | Name="VCALinkTool" | 72 | Name="VCALinkTool" |
73 | /> | 73 | /> |
74 | <Tool | 74 | <Tool |
75 | Name="VCXDCMakeTool" | 75 | Name="VCXDCMakeTool" |
76 | /> | 76 | /> |
77 | <Tool | 77 | <Tool |
78 | Name="VCBscMakeTool" | 78 | Name="VCBscMakeTool" |
79 | /> | 79 | /> |
80 | <Tool | 80 | <Tool |
81 | Name="VCFxCopTool" | 81 | Name="VCFxCopTool" |
82 | /> | 82 | /> |
83 | <Tool | 83 | <Tool |
84 | Name="VCPostBuildEventTool" | 84 | Name="VCPostBuildEventTool" |
85 | /> | 85 | /> |
86 | </Configuration> | 86 | </Configuration> |
87 | <Configuration | 87 | <Configuration |
88 | Name="Release|Win32" | 88 | Name="Release|Win32" |
89 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | 89 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" |
90 | IntermediateDirectory="Release" | 90 | IntermediateDirectory="Release" |
91 | ConfigurationType="4" | 91 | ConfigurationType="4" |
92 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 92 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
93 | CharacterSet="1" | 93 | CharacterSet="1" |
94 | > | 94 | > |
95 | <Tool | 95 | <Tool |
96 | Name="VCPreBuildEventTool" | 96 | Name="VCPreBuildEventTool" |
97 | /> | 97 | /> |
98 | <Tool | 98 | <Tool |
99 | Name="VCCustomBuildTool" | 99 | Name="VCCustomBuildTool" |
100 | /> | 100 | /> |
101 | <Tool | 101 | <Tool |
102 | Name="VCXMLDataGeneratorTool" | 102 | Name="VCXMLDataGeneratorTool" |
103 | /> | 103 | /> |
104 | <Tool | 104 | <Tool |
105 | Name="VCWebServiceProxyGeneratorTool" | 105 | Name="VCWebServiceProxyGeneratorTool" |
106 | /> | 106 | /> |
107 | <Tool | 107 | <Tool |
108 | Name="VCMIDLTool" | 108 | Name="VCMIDLTool" |
109 | /> | 109 | /> |
110 | <Tool | 110 | <Tool |
111 | Name="VCCLCompilerTool" | 111 | Name="VCCLCompilerTool" |
112 | AdditionalOptions="/Oy-" | 112 | AdditionalOptions="/Oy-" |
113 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\" | 113 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\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" | 114 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" |
115 | RuntimeLibrary="0" | 115 | RuntimeLibrary="0" |
116 | StructMemberAlignment="0" | 116 | StructMemberAlignment="0" |
117 | TreatWChar_tAsBuiltInType="false" | 117 | TreatWChar_tAsBuiltInType="false" |
118 | ForceConformanceInForLoopScope="true" | 118 | ForceConformanceInForLoopScope="true" |
119 | UsePrecompiledHeader="0" | 119 | UsePrecompiledHeader="0" |
120 | WarningLevel="3" | 120 | WarningLevel="3" |
121 | WarnAsError="true" | 121 | WarnAsError="true" |
122 | Detect64BitPortabilityProblems="false" | 122 | Detect64BitPortabilityProblems="false" |
123 | DebugInformationFormat="3" | 123 | DebugInformationFormat="3" |
124 | /> | 124 | /> |
125 | <Tool | 125 | <Tool |
126 | Name="VCManagedResourceCompilerTool" | 126 | Name="VCManagedResourceCompilerTool" |
127 | /> | 127 | /> |
128 | <Tool | 128 | <Tool |
129 | Name="VCResourceCompilerTool" | 129 | Name="VCResourceCompilerTool" |
130 | /> | 130 | /> |
131 | <Tool | 131 | <Tool |
132 | Name="VCPreLinkEventTool" | 132 | Name="VCPreLinkEventTool" |
133 | /> | 133 | /> |
134 | <Tool | 134 | <Tool |
135 | Name="VCLibrarianTool" | 135 | Name="VCLibrarianTool" |
136 | OutputFile="$(OutDir)/llprimitive.lib" | 136 | OutputFile="$(OutDir)/llprimitive.lib" |
137 | /> | 137 | /> |
138 | <Tool | 138 | <Tool |
139 | Name="VCALinkTool" | 139 | Name="VCALinkTool" |
140 | /> | 140 | /> |
141 | <Tool | 141 | <Tool |
142 | Name="VCXDCMakeTool" | 142 | Name="VCXDCMakeTool" |
143 | /> | 143 | /> |
144 | <Tool | 144 | <Tool |
145 | Name="VCBscMakeTool" | 145 | Name="VCBscMakeTool" |
146 | /> | 146 | /> |
147 | <Tool | 147 | <Tool |
148 | Name="VCFxCopTool" | 148 | Name="VCFxCopTool" |
149 | /> | 149 | /> |
150 | <Tool | 150 | <Tool |
151 | Name="VCPostBuildEventTool" | 151 | Name="VCPostBuildEventTool" |
152 | /> | 152 | /> |
153 | </Configuration> | 153 | </Configuration> |
154 | <Configuration | 154 | <Configuration |
155 | Name="ReleaseNoOpt|Win32" | 155 | Name="ReleaseNoOpt|Win32" |
156 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | 156 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" |
157 | IntermediateDirectory="$(ConfigurationName)" | 157 | IntermediateDirectory="$(ConfigurationName)" |
158 | ConfigurationType="4" | 158 | ConfigurationType="4" |
159 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 159 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
160 | CharacterSet="1" | 160 | CharacterSet="1" |
161 | > | 161 | > |
162 | <Tool | 162 | <Tool |
163 | Name="VCPreBuildEventTool" | 163 | Name="VCPreBuildEventTool" |
164 | /> | 164 | /> |
165 | <Tool | 165 | <Tool |
166 | Name="VCCustomBuildTool" | 166 | Name="VCCustomBuildTool" |
167 | /> | 167 | /> |
168 | <Tool | 168 | <Tool |
169 | Name="VCXMLDataGeneratorTool" | 169 | Name="VCXMLDataGeneratorTool" |
170 | /> | 170 | /> |
171 | <Tool | 171 | <Tool |
172 | Name="VCWebServiceProxyGeneratorTool" | 172 | Name="VCWebServiceProxyGeneratorTool" |
173 | /> | 173 | /> |
174 | <Tool | 174 | <Tool |
175 | Name="VCMIDLTool" | 175 | Name="VCMIDLTool" |
176 | /> | 176 | /> |
177 | <Tool | 177 | <Tool |
178 | Name="VCCLCompilerTool" | 178 | Name="VCCLCompilerTool" |
179 | AdditionalOptions="/Oy-" | 179 | AdditionalOptions="/Oy-" |
180 | Optimization="0" | 180 | Optimization="0" |
181 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\" | 181 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\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" | 182 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" |
183 | RuntimeLibrary="0" | 183 | RuntimeLibrary="0" |
184 | StructMemberAlignment="0" | 184 | StructMemberAlignment="0" |
185 | TreatWChar_tAsBuiltInType="false" | 185 | TreatWChar_tAsBuiltInType="false" |
186 | ForceConformanceInForLoopScope="true" | 186 | ForceConformanceInForLoopScope="true" |
187 | UsePrecompiledHeader="0" | 187 | UsePrecompiledHeader="0" |
188 | WarningLevel="3" | 188 | WarningLevel="3" |
189 | WarnAsError="true" | 189 | WarnAsError="true" |
190 | Detect64BitPortabilityProblems="false" | 190 | Detect64BitPortabilityProblems="false" |
191 | DebugInformationFormat="3" | 191 | DebugInformationFormat="3" |
192 | /> | 192 | /> |
193 | <Tool | 193 | <Tool |
194 | Name="VCManagedResourceCompilerTool" | 194 | Name="VCManagedResourceCompilerTool" |
195 | /> | 195 | /> |
196 | <Tool | 196 | <Tool |
197 | Name="VCResourceCompilerTool" | 197 | Name="VCResourceCompilerTool" |
198 | /> | 198 | /> |
199 | <Tool | 199 | <Tool |
200 | Name="VCPreLinkEventTool" | 200 | Name="VCPreLinkEventTool" |
201 | /> | 201 | /> |
202 | <Tool | 202 | <Tool |
203 | Name="VCLibrarianTool" | 203 | Name="VCLibrarianTool" |
204 | OutputFile="$(OutDir)/llprimitive.lib" | 204 | OutputFile="$(OutDir)/llprimitive.lib" |
205 | /> | 205 | /> |
206 | <Tool | 206 | <Tool |
207 | Name="VCALinkTool" | 207 | Name="VCALinkTool" |
208 | /> | 208 | /> |
209 | <Tool | 209 | <Tool |
210 | Name="VCXDCMakeTool" | 210 | Name="VCXDCMakeTool" |
211 | /> | 211 | /> |
212 | <Tool | 212 | <Tool |
213 | Name="VCBscMakeTool" | 213 | Name="VCBscMakeTool" |
214 | /> | 214 | /> |
215 | <Tool | 215 | <Tool |
216 | Name="VCFxCopTool" | 216 | Name="VCFxCopTool" |
217 | /> | 217 | /> |
218 | <Tool | 218 | <Tool |
219 | Name="VCPostBuildEventTool" | 219 | Name="VCPostBuildEventTool" |
220 | /> | 220 | /> |
221 | </Configuration> | 221 | </Configuration> |
222 | </Configurations> | 222 | </Configurations> |
223 | <References> | 223 | <References> |
224 | </References> | 224 | </References> |
225 | <Files> | 225 | <Files> |
226 | <Filter | 226 | <Filter |
227 | Name="Source Files" | 227 | Name="Source Files" |
228 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" | 228 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" |
229 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | 229 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" |
230 | > | 230 | > |
231 | <File | 231 | <File |
232 | RelativePath=".\llmaterialtable.cpp" | 232 | RelativePath=".\llmaterialtable.cpp" |
233 | > | 233 | > |
234 | </File> | 234 | </File> |
235 | <File | 235 | <File |
236 | RelativePath=".\llprimitive.cpp" | 236 | RelativePath=".\llprimitive.cpp" |
237 | > | 237 | > |
238 | </File> | 238 | </File> |
239 | <File | 239 | <File |
240 | RelativePath=".\lltextureanim.cpp" | 240 | RelativePath=".\lltextureanim.cpp" |
241 | > | 241 | > |
242 | </File> | 242 | </File> |
243 | <File | 243 | <File |
244 | RelativePath=".\lltextureentry.cpp" | 244 | RelativePath=".\lltextureentry.cpp" |
245 | > | 245 | > |
246 | </File> | 246 | </File> |
247 | <File | 247 | <File |
248 | RelativePath=".\lltreeparams.cpp" | 248 | RelativePath=".\lltreeparams.cpp" |
249 | > | 249 | > |
250 | </File> | 250 | </File> |
251 | <File | 251 | <File |
252 | RelativePath=".\llvolumemessage.cpp" | 252 | RelativePath=".\llvolumemessage.cpp" |
253 | > | 253 | > |
254 | </File> | 254 | </File> |
255 | <File | 255 | <File |
256 | RelativePath=".\llvolumexml.cpp" | 256 | RelativePath=".\llvolumexml.cpp" |
257 | > | 257 | > |
258 | </File> | 258 | </File> |
259 | </Filter> | 259 | </Filter> |
260 | <Filter | 260 | <Filter |
261 | Name="Header Files" | 261 | Name="Header Files" |
262 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | 262 | Filter="h;hpp;hxx;hm;inl;inc;xsd" |
263 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | 263 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" |
264 | > | 264 | > |
265 | <File | 265 | <File |
266 | RelativePath=".\legacy_object_types.h" | 266 | RelativePath=".\legacy_object_types.h" |
267 | > | 267 | > |
268 | </File> | 268 | </File> |
269 | <File | 269 | <File |
270 | RelativePath=".\llmaterialtable.h" | 270 | RelativePath=".\llmaterialtable.h" |
271 | > | 271 | > |
272 | </File> | 272 | </File> |
273 | <File | 273 | <File |
274 | RelativePath=".\llprimitive.h" | 274 | RelativePath=".\llprimitive.h" |
275 | > | 275 | > |
276 | </File> | 276 | </File> |
277 | <File | 277 | <File |
278 | RelativePath=".\lltextureanim.h" | 278 | RelativePath=".\lltextureanim.h" |
279 | > | 279 | > |
280 | </File> | 280 | </File> |
281 | <File | 281 | <File |
282 | RelativePath=".\lltextureentry.h" | 282 | RelativePath=".\lltextureentry.h" |
283 | > | 283 | > |
284 | </File> | 284 | </File> |
285 | <File | 285 | <File |
286 | RelativePath=".\lltree_common.h" | 286 | RelativePath=".\lltree_common.h" |
287 | > | 287 | > |
288 | </File> | 288 | </File> |
289 | <File | 289 | <File |
290 | RelativePath=".\lltreeparams.h" | 290 | RelativePath=".\lltreeparams.h" |
291 | > | 291 | > |
292 | </File> | 292 | </File> |
293 | <File | 293 | <File |
294 | RelativePath=".\llvolumemessage.h" | 294 | RelativePath=".\llvolumemessage.h" |
295 | > | 295 | > |
296 | </File> | 296 | </File> |
297 | <File | 297 | <File |
298 | RelativePath=".\llvolumexml.h" | 298 | RelativePath=".\llvolumexml.h" |
299 | > | 299 | > |
300 | </File> | 300 | </File> |
301 | <File | 301 | <File |
302 | RelativePath=".\material_codes.h" | 302 | RelativePath=".\material_codes.h" |
303 | > | 303 | > |
304 | </File> | 304 | </File> |
305 | <File | 305 | <File |
306 | RelativePath=".\object_flags.h" | 306 | RelativePath=".\object_flags.h" |
307 | > | 307 | > |
308 | </File> | 308 | </File> |
309 | </Filter> | 309 | </Filter> |
310 | <Filter | 310 | <Filter |
311 | Name="Resource Files" | 311 | Name="Resource Files" |
312 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | 312 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" |
313 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | 313 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" |
314 | > | 314 | > |
315 | </Filter> | 315 | </Filter> |
316 | </Files> | 316 | </Files> |
317 | <Globals> | 317 | <Globals> |
318 | </Globals> | 318 | </Globals> |
319 | </VisualStudioProject> | 319 | </VisualStudioProject> |
diff --git a/linden/indra/llprimitive/llprimitive_vc9.vcproj b/linden/indra/llprimitive/llprimitive_vc9.vcproj index 427e752..1e04970 100644 --- a/linden/indra/llprimitive/llprimitive_vc9.vcproj +++ b/linden/indra/llprimitive/llprimitive_vc9.vcproj | |||
@@ -1,320 +1,320 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
2 | <VisualStudioProject | 2 | <VisualStudioProject |
3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
4 | Version="9.00" | 4 | Version="9.00" |
5 | Name="llprimitive" | 5 | Name="llprimitive" |
6 | ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}" | 6 | ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}" |
7 | RootNamespace="llprimitive" | 7 | RootNamespace="llprimitive" |
8 | Keyword="Win32Proj" | 8 | Keyword="Win32Proj" |
9 | TargetFrameworkVersion="131072" | 9 | TargetFrameworkVersion="131072" |
10 | > | 10 | > |
11 | <Platforms> | 11 | <Platforms> |
12 | <Platform | 12 | <Platform |
13 | Name="Win32" | 13 | Name="Win32" |
14 | /> | 14 | /> |
15 | </Platforms> | 15 | </Platforms> |
16 | <ToolFiles> | 16 | <ToolFiles> |
17 | </ToolFiles> | 17 | </ToolFiles> |
18 | <Configurations> | 18 | <Configurations> |
19 | <Configuration | 19 | <Configuration |
20 | Name="Debug|Win32" | 20 | Name="Debug|Win32" |
21 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | 21 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" |
22 | IntermediateDirectory="Debug" | 22 | IntermediateDirectory="Debug" |
23 | ConfigurationType="4" | 23 | ConfigurationType="4" |
24 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 24 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
25 | CharacterSet="1" | 25 | CharacterSet="1" |
26 | > | 26 | > |
27 | <Tool | 27 | <Tool |
28 | Name="VCPreBuildEventTool" | 28 | Name="VCPreBuildEventTool" |
29 | /> | 29 | /> |
30 | <Tool | 30 | <Tool |
31 | Name="VCCustomBuildTool" | 31 | Name="VCCustomBuildTool" |
32 | /> | 32 | /> |
33 | <Tool | 33 | <Tool |
34 | Name="VCXMLDataGeneratorTool" | 34 | Name="VCXMLDataGeneratorTool" |
35 | /> | 35 | /> |
36 | <Tool | 36 | <Tool |
37 | Name="VCWebServiceProxyGeneratorTool" | 37 | Name="VCWebServiceProxyGeneratorTool" |
38 | /> | 38 | /> |
39 | <Tool | 39 | <Tool |
40 | Name="VCMIDLTool" | 40 | Name="VCMIDLTool" |
41 | /> | 41 | /> |
42 | <Tool | 42 | <Tool |
43 | Name="VCCLCompilerTool" | 43 | Name="VCCLCompilerTool" |
44 | Optimization="0" | 44 | Optimization="0" |
45 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\" | 45 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\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" | 46 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG" |
47 | MinimalRebuild="true" | 47 | MinimalRebuild="true" |
48 | BasicRuntimeChecks="3" | 48 | BasicRuntimeChecks="3" |
49 | RuntimeLibrary="1" | 49 | RuntimeLibrary="1" |
50 | StructMemberAlignment="4" | 50 | StructMemberAlignment="4" |
51 | TreatWChar_tAsBuiltInType="false" | 51 | TreatWChar_tAsBuiltInType="false" |
52 | ForceConformanceInForLoopScope="true" | 52 | ForceConformanceInForLoopScope="true" |
53 | UsePrecompiledHeader="0" | 53 | UsePrecompiledHeader="0" |
54 | WarningLevel="3" | 54 | WarningLevel="3" |
55 | WarnAsError="true" | 55 | WarnAsError="true" |
56 | Detect64BitPortabilityProblems="false" | 56 | Detect64BitPortabilityProblems="false" |
57 | DebugInformationFormat="4" | 57 | DebugInformationFormat="4" |
58 | /> | 58 | /> |
59 | <Tool | 59 | <Tool |
60 | Name="VCManagedResourceCompilerTool" | 60 | Name="VCManagedResourceCompilerTool" |
61 | /> | 61 | /> |
62 | <Tool | 62 | <Tool |
63 | Name="VCResourceCompilerTool" | 63 | Name="VCResourceCompilerTool" |
64 | /> | 64 | /> |
65 | <Tool | 65 | <Tool |
66 | Name="VCPreLinkEventTool" | 66 | Name="VCPreLinkEventTool" |
67 | /> | 67 | /> |
68 | <Tool | 68 | <Tool |
69 | Name="VCLibrarianTool" | 69 | Name="VCLibrarianTool" |
70 | OutputFile="$(OutDir)/llprimitive.lib" | 70 | OutputFile="$(OutDir)/llprimitive.lib" |
71 | /> | 71 | /> |
72 | <Tool | 72 | <Tool |
73 | Name="VCALinkTool" | 73 | Name="VCALinkTool" |
74 | /> | 74 | /> |
75 | <Tool | 75 | <Tool |
76 | Name="VCXDCMakeTool" | 76 | Name="VCXDCMakeTool" |
77 | /> | 77 | /> |
78 | <Tool | 78 | <Tool |
79 | Name="VCBscMakeTool" | 79 | Name="VCBscMakeTool" |
80 | /> | 80 | /> |
81 | <Tool | 81 | <Tool |
82 | Name="VCFxCopTool" | 82 | Name="VCFxCopTool" |
83 | /> | 83 | /> |
84 | <Tool | 84 | <Tool |
85 | Name="VCPostBuildEventTool" | 85 | Name="VCPostBuildEventTool" |
86 | /> | 86 | /> |
87 | </Configuration> | 87 | </Configuration> |
88 | <Configuration | 88 | <Configuration |
89 | Name="Release|Win32" | 89 | Name="Release|Win32" |
90 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | 90 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" |
91 | IntermediateDirectory="Release" | 91 | IntermediateDirectory="Release" |
92 | ConfigurationType="4" | 92 | ConfigurationType="4" |
93 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 93 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
94 | CharacterSet="1" | 94 | CharacterSet="1" |
95 | > | 95 | > |
96 | <Tool | 96 | <Tool |
97 | Name="VCPreBuildEventTool" | 97 | Name="VCPreBuildEventTool" |
98 | /> | 98 | /> |
99 | <Tool | 99 | <Tool |
100 | Name="VCCustomBuildTool" | 100 | Name="VCCustomBuildTool" |
101 | /> | 101 | /> |
102 | <Tool | 102 | <Tool |
103 | Name="VCXMLDataGeneratorTool" | 103 | Name="VCXMLDataGeneratorTool" |
104 | /> | 104 | /> |
105 | <Tool | 105 | <Tool |
106 | Name="VCWebServiceProxyGeneratorTool" | 106 | Name="VCWebServiceProxyGeneratorTool" |
107 | /> | 107 | /> |
108 | <Tool | 108 | <Tool |
109 | Name="VCMIDLTool" | 109 | Name="VCMIDLTool" |
110 | /> | 110 | /> |
111 | <Tool | 111 | <Tool |
112 | Name="VCCLCompilerTool" | 112 | Name="VCCLCompilerTool" |
113 | AdditionalOptions="/Oy-" | 113 | AdditionalOptions="/Oy-" |
114 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\" | 114 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\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" | 115 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" |
116 | RuntimeLibrary="0" | 116 | RuntimeLibrary="0" |
117 | StructMemberAlignment="0" | 117 | StructMemberAlignment="0" |
118 | TreatWChar_tAsBuiltInType="false" | 118 | TreatWChar_tAsBuiltInType="false" |
119 | ForceConformanceInForLoopScope="true" | 119 | ForceConformanceInForLoopScope="true" |
120 | UsePrecompiledHeader="0" | 120 | UsePrecompiledHeader="0" |
121 | WarningLevel="3" | 121 | WarningLevel="3" |
122 | WarnAsError="true" | 122 | WarnAsError="true" |
123 | Detect64BitPortabilityProblems="false" | 123 | Detect64BitPortabilityProblems="false" |
124 | DebugInformationFormat="3" | 124 | DebugInformationFormat="3" |
125 | /> | 125 | /> |
126 | <Tool | 126 | <Tool |
127 | Name="VCManagedResourceCompilerTool" | 127 | Name="VCManagedResourceCompilerTool" |
128 | /> | 128 | /> |
129 | <Tool | 129 | <Tool |
130 | Name="VCResourceCompilerTool" | 130 | Name="VCResourceCompilerTool" |
131 | /> | 131 | /> |
132 | <Tool | 132 | <Tool |
133 | Name="VCPreLinkEventTool" | 133 | Name="VCPreLinkEventTool" |
134 | /> | 134 | /> |
135 | <Tool | 135 | <Tool |
136 | Name="VCLibrarianTool" | 136 | Name="VCLibrarianTool" |
137 | OutputFile="$(OutDir)/llprimitive.lib" | 137 | OutputFile="$(OutDir)/llprimitive.lib" |
138 | /> | 138 | /> |
139 | <Tool | 139 | <Tool |
140 | Name="VCALinkTool" | 140 | Name="VCALinkTool" |
141 | /> | 141 | /> |
142 | <Tool | 142 | <Tool |
143 | Name="VCXDCMakeTool" | 143 | Name="VCXDCMakeTool" |
144 | /> | 144 | /> |
145 | <Tool | 145 | <Tool |
146 | Name="VCBscMakeTool" | 146 | Name="VCBscMakeTool" |
147 | /> | 147 | /> |
148 | <Tool | 148 | <Tool |
149 | Name="VCFxCopTool" | 149 | Name="VCFxCopTool" |
150 | /> | 150 | /> |
151 | <Tool | 151 | <Tool |
152 | Name="VCPostBuildEventTool" | 152 | Name="VCPostBuildEventTool" |
153 | /> | 153 | /> |
154 | </Configuration> | 154 | </Configuration> |
155 | <Configuration | 155 | <Configuration |
156 | Name="ReleaseNoOpt|Win32" | 156 | Name="ReleaseNoOpt|Win32" |
157 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" | 157 | OutputDirectory="../lib_$(ConfigurationName)/i686-win32" |
158 | IntermediateDirectory="$(ConfigurationName)" | 158 | IntermediateDirectory="$(ConfigurationName)" |
159 | ConfigurationType="4" | 159 | ConfigurationType="4" |
160 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" | 160 | InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" |
161 | CharacterSet="1" | 161 | CharacterSet="1" |
162 | > | 162 | > |
163 | <Tool | 163 | <Tool |
164 | Name="VCPreBuildEventTool" | 164 | Name="VCPreBuildEventTool" |
165 | /> | 165 | /> |
166 | <Tool | 166 | <Tool |
167 | Name="VCCustomBuildTool" | 167 | Name="VCCustomBuildTool" |
168 | /> | 168 | /> |
169 | <Tool | 169 | <Tool |
170 | Name="VCXMLDataGeneratorTool" | 170 | Name="VCXMLDataGeneratorTool" |
171 | /> | 171 | /> |
172 | <Tool | 172 | <Tool |
173 | Name="VCWebServiceProxyGeneratorTool" | 173 | Name="VCWebServiceProxyGeneratorTool" |
174 | /> | 174 | /> |
175 | <Tool | 175 | <Tool |
176 | Name="VCMIDLTool" | 176 | Name="VCMIDLTool" |
177 | /> | 177 | /> |
178 | <Tool | 178 | <Tool |
179 | Name="VCCLCompilerTool" | 179 | Name="VCCLCompilerTool" |
180 | AdditionalOptions="/Oy-" | 180 | AdditionalOptions="/Oy-" |
181 | Optimization="0" | 181 | Optimization="0" |
182 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\" | 182 | AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\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" | 183 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE" |
184 | RuntimeLibrary="0" | 184 | RuntimeLibrary="0" |
185 | StructMemberAlignment="0" | 185 | StructMemberAlignment="0" |
186 | TreatWChar_tAsBuiltInType="false" | 186 | TreatWChar_tAsBuiltInType="false" |
187 | ForceConformanceInForLoopScope="true" | 187 | ForceConformanceInForLoopScope="true" |
188 | UsePrecompiledHeader="0" | 188 | UsePrecompiledHeader="0" |
189 | WarningLevel="3" | 189 | WarningLevel="3" |
190 | WarnAsError="true" | 190 | WarnAsError="true" |
191 | Detect64BitPortabilityProblems="false" | 191 | Detect64BitPortabilityProblems="false" |
192 | DebugInformationFormat="3" | 192 | DebugInformationFormat="3" |
193 | /> | 193 | /> |
194 | <Tool | 194 | <Tool |
195 | Name="VCManagedResourceCompilerTool" | 195 | Name="VCManagedResourceCompilerTool" |
196 | /> | 196 | /> |
197 | <Tool | 197 | <Tool |
198 | Name="VCResourceCompilerTool" | 198 | Name="VCResourceCompilerTool" |
199 | /> | 199 | /> |
200 | <Tool | 200 | <Tool |
201 | Name="VCPreLinkEventTool" | 201 | Name="VCPreLinkEventTool" |
202 | /> | 202 | /> |
203 | <Tool | 203 | <Tool |
204 | Name="VCLibrarianTool" | 204 | Name="VCLibrarianTool" |
205 | OutputFile="$(OutDir)/llprimitive.lib" | 205 | OutputFile="$(OutDir)/llprimitive.lib" |
206 | /> | 206 | /> |
207 | <Tool | 207 | <Tool |
208 | Name="VCALinkTool" | 208 | Name="VCALinkTool" |
209 | /> | 209 | /> |
210 | <Tool | 210 | <Tool |
211 | Name="VCXDCMakeTool" | 211 | Name="VCXDCMakeTool" |
212 | /> | 212 | /> |
213 | <Tool | 213 | <Tool |
214 | Name="VCBscMakeTool" | 214 | Name="VCBscMakeTool" |
215 | /> | 215 | /> |
216 | <Tool | 216 | <Tool |
217 | Name="VCFxCopTool" | 217 | Name="VCFxCopTool" |
218 | /> | 218 | /> |
219 | <Tool | 219 | <Tool |
220 | Name="VCPostBuildEventTool" | 220 | Name="VCPostBuildEventTool" |
221 | /> | 221 | /> |
222 | </Configuration> | 222 | </Configuration> |
223 | </Configurations> | 223 | </Configurations> |
224 | <References> | 224 | <References> |
225 | </References> | 225 | </References> |
226 | <Files> | 226 | <Files> |
227 | <Filter | 227 | <Filter |
228 | Name="Source Files" | 228 | Name="Source Files" |
229 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" | 229 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" |
230 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | 230 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" |
231 | > | 231 | > |
232 | <File | 232 | <File |
233 | RelativePath=".\llmaterialtable.cpp" | 233 | RelativePath=".\llmaterialtable.cpp" |
234 | > | 234 | > |
235 | </File> | 235 | </File> |
236 | <File | 236 | <File |
237 | RelativePath=".\llprimitive.cpp" | 237 | RelativePath=".\llprimitive.cpp" |
238 | > | 238 | > |
239 | </File> | 239 | </File> |
240 | <File | 240 | <File |
241 | RelativePath=".\lltextureanim.cpp" | 241 | RelativePath=".\lltextureanim.cpp" |
242 | > | 242 | > |
243 | </File> | 243 | </File> |
244 | <File | 244 | <File |
245 | RelativePath=".\lltextureentry.cpp" | 245 | RelativePath=".\lltextureentry.cpp" |
246 | > | 246 | > |
247 | </File> | 247 | </File> |
248 | <File | 248 | <File |
249 | RelativePath=".\lltreeparams.cpp" | 249 | RelativePath=".\lltreeparams.cpp" |
250 | > | 250 | > |
251 | </File> | 251 | </File> |
252 | <File | 252 | <File |
253 | RelativePath=".\llvolumemessage.cpp" | 253 | RelativePath=".\llvolumemessage.cpp" |
254 | > | 254 | > |
255 | </File> | 255 | </File> |
256 | <File | 256 | <File |
257 | RelativePath=".\llvolumexml.cpp" | 257 | RelativePath=".\llvolumexml.cpp" |
258 | > | 258 | > |
259 | </File> | 259 | </File> |
260 | </Filter> | 260 | </Filter> |
261 | <Filter | 261 | <Filter |
262 | Name="Header Files" | 262 | Name="Header Files" |
263 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | 263 | Filter="h;hpp;hxx;hm;inl;inc;xsd" |
264 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | 264 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" |
265 | > | 265 | > |
266 | <File | 266 | <File |
267 | RelativePath=".\legacy_object_types.h" | 267 | RelativePath=".\legacy_object_types.h" |
268 | > | 268 | > |
269 | </File> | 269 | </File> |
270 | <File | 270 | <File |
271 | RelativePath=".\llmaterialtable.h" | 271 | RelativePath=".\llmaterialtable.h" |
272 | > | 272 | > |
273 | </File> | 273 | </File> |
274 | <File | 274 | <File |
275 | RelativePath=".\llprimitive.h" | 275 | RelativePath=".\llprimitive.h" |
276 | > | 276 | > |
277 | </File> | 277 | </File> |
278 | <File | 278 | <File |
279 | RelativePath=".\lltextureanim.h" | 279 | RelativePath=".\lltextureanim.h" |
280 | > | 280 | > |
281 | </File> | 281 | </File> |
282 | <File | 282 | <File |
283 | RelativePath=".\lltextureentry.h" | 283 | RelativePath=".\lltextureentry.h" |
284 | > | 284 | > |
285 | </File> | 285 | </File> |
286 | <File | 286 | <File |
287 | RelativePath=".\lltree_common.h" | 287 | RelativePath=".\lltree_common.h" |
288 | > | 288 | > |
289 | </File> | 289 | </File> |
290 | <File | 290 | <File |
291 | RelativePath=".\lltreeparams.h" | 291 | RelativePath=".\lltreeparams.h" |
292 | > | 292 | > |
293 | </File> | 293 | </File> |
294 | <File | 294 | <File |
295 | RelativePath=".\llvolumemessage.h" | 295 | RelativePath=".\llvolumemessage.h" |
296 | > | 296 | > |
297 | </File> | 297 | </File> |
298 | <File | 298 | <File |
299 | RelativePath=".\llvolumexml.h" | 299 | RelativePath=".\llvolumexml.h" |
300 | > | 300 | > |
301 | </File> | 301 | </File> |
302 | <File | 302 | <File |
303 | RelativePath=".\material_codes.h" | 303 | RelativePath=".\material_codes.h" |
304 | > | 304 | > |
305 | </File> | 305 | </File> |
306 | <File | 306 | <File |
307 | RelativePath=".\object_flags.h" | 307 | RelativePath=".\object_flags.h" |
308 | > | 308 | > |
309 | </File> | 309 | </File> |
310 | </Filter> | 310 | </Filter> |
311 | <Filter | 311 | <Filter |
312 | Name="Resource Files" | 312 | Name="Resource Files" |
313 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | 313 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" |
314 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | 314 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" |
315 | > | 315 | > |
316 | </Filter> | 316 | </Filter> |
317 | </Files> | 317 | </Files> |
318 | <Globals> | 318 | <Globals> |
319 | </Globals> | 319 | </Globals> |
320 | </VisualStudioProject> | 320 | </VisualStudioProject> |
diff --git a/linden/indra/llprimitive/lltextureentry.cpp b/linden/indra/llprimitive/lltextureentry.cpp index 9b13182..e1a4882 100644 --- a/linden/indra/llprimitive/lltextureentry.cpp +++ b/linden/indra/llprimitive/lltextureentry.cpp | |||
@@ -389,4 +389,3 @@ S32 LLTextureEntry::setGlow(F32 glow) | |||
389 | } | 389 | } |
390 | return 0; | 390 | return 0; |
391 | } | 391 | } |
392 | |||