diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/llprimitive | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-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 'linden/indra/llprimitive')
-rw-r--r-- | linden/indra/llprimitive/CMakeLists.txt | 49 | ||||
-rw-r--r-- | linden/indra/llprimitive/files.lst | 7 | ||||
-rw-r--r-- | linden/indra/llprimitive/llmaterialtable.cpp | 29 | ||||
-rw-r--r-- | linden/indra/llprimitive/llmaterialtable.h | 20 | ||||
-rw-r--r-- | linden/indra/llprimitive/llprimitive.cpp | 65 | ||||
-rw-r--r-- | linden/indra/llprimitive/llprimitive.h | 4 | ||||
-rw-r--r-- | linden/indra/llprimitive/llprimitive.vcproj | 224 | ||||
-rw-r--r-- | linden/indra/llprimitive/llprimitive_vc8.vcproj | 319 | ||||
-rw-r--r-- | linden/indra/llprimitive/llprimitive_vc9.vcproj | 320 |
9 files changed, 102 insertions, 935 deletions
diff --git a/linden/indra/llprimitive/CMakeLists.txt b/linden/indra/llprimitive/CMakeLists.txt new file mode 100644 index 0000000..5dc4c70 --- /dev/null +++ b/linden/indra/llprimitive/CMakeLists.txt | |||
@@ -0,0 +1,49 @@ | |||
1 | # -*- cmake -*- | ||
2 | |||
3 | project(llprimitive) | ||
4 | |||
5 | include(00-Common) | ||
6 | include(LLCommon) | ||
7 | include(LLMath) | ||
8 | include(LLMessage) | ||
9 | include(LLXML) | ||
10 | |||
11 | include_directories( | ||
12 | ${LLCOMMON_INCLUDE_DIRS} | ||
13 | ${LLMATH_INCLUDE_DIRS} | ||
14 | ${LLMESSAGE_INCLUDE_DIRS} | ||
15 | ${LLXML_INCLUDE_DIRS} | ||
16 | ) | ||
17 | |||
18 | set(llprimitive_SOURCE_FILES | ||
19 | llmaterialtable.cpp | ||
20 | llprimitive.cpp | ||
21 | lltextureanim.cpp | ||
22 | lltextureentry.cpp | ||
23 | lltreeparams.cpp | ||
24 | llvolumemessage.cpp | ||
25 | llvolumexml.cpp | ||
26 | ) | ||
27 | |||
28 | set(llprimitive_HEADER_FILES | ||
29 | CMakeLists.txt | ||
30 | |||
31 | legacy_object_types.h | ||
32 | llmaterialtable.h | ||
33 | llprimitive.h | ||
34 | lltextureanim.h | ||
35 | lltextureentry.h | ||
36 | lltreeparams.h | ||
37 | lltree_common.h | ||
38 | llvolumemessage.h | ||
39 | llvolumexml.h | ||
40 | material_codes.h | ||
41 | object_flags.h | ||
42 | ) | ||
43 | |||
44 | set_source_files_properties(${llprimitive_HEADER_FILES} | ||
45 | PROPERTIES HEADER_FILE_ONLY TRUE) | ||
46 | |||
47 | list(APPEND llprimitive_SOURCE_FILES ${llprimitive_HEADER_FILES}) | ||
48 | |||
49 | add_library (llprimitive ${llprimitive_SOURCE_FILES}) | ||
diff --git a/linden/indra/llprimitive/files.lst b/linden/indra/llprimitive/files.lst deleted file mode 100644 index b9f5dbc..0000000 --- a/linden/indra/llprimitive/files.lst +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | llprimitive/llmaterialtable.cpp | ||
2 | llprimitive/llprimitive.cpp | ||
3 | llprimitive/lltextureanim.cpp | ||
4 | llprimitive/lltextureentry.cpp | ||
5 | llprimitive/lltreeparams.cpp | ||
6 | llprimitive/llvolumemessage.cpp | ||
7 | llprimitive/llvolumexml.cpp | ||
diff --git a/linden/indra/llprimitive/llmaterialtable.cpp b/linden/indra/llprimitive/llmaterialtable.cpp index 5e45e44..4fb6904 100644 --- a/linden/indra/llprimitive/llmaterialtable.cpp +++ b/linden/indra/llprimitive/llmaterialtable.cpp | |||
@@ -125,14 +125,15 @@ LLMaterialTable::~LLMaterialTable() | |||
125 | 125 | ||
126 | void LLMaterialTable::initBasicTable() | 126 | void LLMaterialTable::initBasicTable() |
127 | { | 127 | { |
128 | add(LL_MCODE_STONE,"Stone", LL_DEFAULT_STONE_UUID); | 128 | // *TODO: Translate |
129 | add(LL_MCODE_METAL,"Metal", LL_DEFAULT_METAL_UUID); | 129 | add(LL_MCODE_STONE,std::string("Stone"), LL_DEFAULT_STONE_UUID); |
130 | add(LL_MCODE_GLASS,"Glass", LL_DEFAULT_GLASS_UUID); | 130 | add(LL_MCODE_METAL,std::string("Metal"), LL_DEFAULT_METAL_UUID); |
131 | add(LL_MCODE_WOOD,"Wood", LL_DEFAULT_WOOD_UUID); | 131 | add(LL_MCODE_GLASS,std::string("Glass"), LL_DEFAULT_GLASS_UUID); |
132 | add(LL_MCODE_FLESH,"Flesh", LL_DEFAULT_FLESH_UUID); | 132 | add(LL_MCODE_WOOD,std::string("Wood"), LL_DEFAULT_WOOD_UUID); |
133 | add(LL_MCODE_PLASTIC,"Plastic", LL_DEFAULT_PLASTIC_UUID); | 133 | add(LL_MCODE_FLESH,std::string("Flesh"), LL_DEFAULT_FLESH_UUID); |
134 | add(LL_MCODE_RUBBER,"Rubber", LL_DEFAULT_RUBBER_UUID); | 134 | add(LL_MCODE_PLASTIC,std::string("Plastic"), LL_DEFAULT_PLASTIC_UUID); |
135 | add(LL_MCODE_LIGHT,"Light", LL_DEFAULT_LIGHT_UUID); | 135 | add(LL_MCODE_RUBBER,std::string("Rubber"), LL_DEFAULT_RUBBER_UUID); |
136 | add(LL_MCODE_LIGHT,std::string("Light"), LL_DEFAULT_LIGHT_UUID); | ||
136 | 137 | ||
137 | // specify densities for these materials. . . | 138 | // specify densities for these materials. . . |
138 | // these were taken from http://www.mcelwee.net/html/densities_of_various_materials.html | 139 | // these were taken from http://www.mcelwee.net/html/densities_of_various_materials.html |
@@ -331,7 +332,7 @@ void LLMaterialTable::initBasicTable() | |||
331 | } | 332 | } |
332 | } | 333 | } |
333 | 334 | ||
334 | BOOL LLMaterialTable::add(U8 mcode, char* name, const LLUUID &uuid) | 335 | BOOL LLMaterialTable::add(U8 mcode, const std::string& name, const LLUUID &uuid) |
335 | { | 336 | { |
336 | LLMaterialInfo *infop; | 337 | LLMaterialInfo *infop; |
337 | 338 | ||
@@ -466,13 +467,13 @@ BOOL LLMaterialTable::addDamageAndEnergy(U8 mcode, const F32 &hp_mod, const F32 | |||
466 | return FALSE; | 467 | return FALSE; |
467 | } | 468 | } |
468 | 469 | ||
469 | LLUUID LLMaterialTable::getDefaultTextureID(char* name) | 470 | LLUUID LLMaterialTable::getDefaultTextureID(const std::string& name) |
470 | { | 471 | { |
471 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); | 472 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
472 | iter != mMaterialInfoList.end(); ++iter) | 473 | iter != mMaterialInfoList.end(); ++iter) |
473 | { | 474 | { |
474 | LLMaterialInfo *infop = *iter; | 475 | LLMaterialInfo *infop = *iter; |
475 | if (!strcmp(name, infop->mName)) | 476 | if (name == infop->mName) |
476 | { | 477 | { |
477 | return infop->mDefaultTextureID; | 478 | return infop->mDefaultTextureID; |
478 | } | 479 | } |
@@ -499,13 +500,13 @@ LLUUID LLMaterialTable::getDefaultTextureID(U8 mcode) | |||
499 | } | 500 | } |
500 | 501 | ||
501 | 502 | ||
502 | U8 LLMaterialTable::getMCode(const char* name) | 503 | U8 LLMaterialTable::getMCode(const std::string& name) |
503 | { | 504 | { |
504 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); | 505 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
505 | iter != mMaterialInfoList.end(); ++iter) | 506 | iter != mMaterialInfoList.end(); ++iter) |
506 | { | 507 | { |
507 | LLMaterialInfo *infop = *iter; | 508 | LLMaterialInfo *infop = *iter; |
508 | if (!strcmp(name, infop->mName)) | 509 | if (name == infop->mName) |
509 | { | 510 | { |
510 | return infop->mMCode; | 511 | return infop->mMCode; |
511 | } | 512 | } |
@@ -515,7 +516,7 @@ U8 LLMaterialTable::getMCode(const char* name) | |||
515 | } | 516 | } |
516 | 517 | ||
517 | 518 | ||
518 | char* LLMaterialTable::getName(U8 mcode) | 519 | std::string LLMaterialTable::getName(U8 mcode) |
519 | { | 520 | { |
520 | mcode &= LL_MCODE_MASK; | 521 | mcode &= LL_MCODE_MASK; |
521 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); | 522 | for (info_list_t::iterator iter = mMaterialInfoList.begin(); |
diff --git a/linden/indra/llprimitive/llmaterialtable.h b/linden/indra/llprimitive/llmaterialtable.h index 863fb25..8290195 100644 --- a/linden/indra/llprimitive/llmaterialtable.h +++ b/linden/indra/llprimitive/llmaterialtable.h | |||
@@ -67,7 +67,7 @@ class LLMaterialInfo | |||
67 | { | 67 | { |
68 | public: | 68 | public: |
69 | U8 mMCode; | 69 | U8 mMCode; |
70 | char mName[LLMATERIAL_INFO_NAME_LENGTH]; /* Flawfinder: ignore */ | 70 | std::string mName; |
71 | LLUUID mDefaultTextureID; | 71 | LLUUID mDefaultTextureID; |
72 | LLUUID mShatterSoundID; | 72 | LLUUID mShatterSoundID; |
73 | F32 mDensity; // kg/m^3 | 73 | F32 mDensity; // kg/m^3 |
@@ -79,24 +79,20 @@ public: | |||
79 | F32 mDamageModifier; // modifier on KE based damage | 79 | F32 mDamageModifier; // modifier on KE based damage |
80 | F32 mEPModifier; // modifier on mass based EP total | 80 | F32 mEPModifier; // modifier on mass based EP total |
81 | 81 | ||
82 | LLMaterialInfo(U8 mcode, char* name, const LLUUID &uuid) | 82 | LLMaterialInfo(U8 mcode, const std::string& name, const LLUUID &uuid) |
83 | { | 83 | { |
84 | init(mcode,name,uuid); | 84 | init(mcode,name,uuid); |
85 | }; | 85 | }; |
86 | 86 | ||
87 | void init(U8 mcode, char* name, const LLUUID &uuid) | 87 | void init(U8 mcode, const std::string& name, const LLUUID &uuid) |
88 | { | 88 | { |
89 | mName[0] = 0; | ||
90 | mDensity = 1000.f; // default to 1000.0 (water) | 89 | mDensity = 1000.f; // default to 1000.0 (water) |
91 | mHPModifier = 1.f; | 90 | mHPModifier = 1.f; |
92 | mDamageModifier = 1.f; | 91 | mDamageModifier = 1.f; |
93 | mEPModifier = 1.f; | 92 | mEPModifier = 1.f; |
94 | 93 | ||
95 | mMCode = mcode; | 94 | mMCode = mcode; |
96 | if (name) | 95 | mName = name; |
97 | { | ||
98 | LLString::copy(mName,name,LLMATERIAL_INFO_NAME_LENGTH); | ||
99 | } | ||
100 | mDefaultTextureID = uuid; | 96 | mDefaultTextureID = uuid; |
101 | }; | 97 | }; |
102 | 98 | ||
@@ -150,7 +146,7 @@ public: | |||
150 | 146 | ||
151 | void initBasicTable(); | 147 | void initBasicTable(); |
152 | 148 | ||
153 | BOOL add(U8 mcode, char* name, const LLUUID &uuid); | 149 | BOOL add(U8 mcode, const std::string& name, const LLUUID &uuid); |
154 | BOOL addCollisionSound(U8 mcode, U8 mcode2, const LLUUID &uuid); | 150 | BOOL addCollisionSound(U8 mcode, U8 mcode2, const LLUUID &uuid); |
155 | BOOL addSlidingSound(U8 mcode, U8 mcode2, const LLUUID &uuid); | 151 | BOOL addSlidingSound(U8 mcode, U8 mcode2, const LLUUID &uuid); |
156 | BOOL addRollingSound(U8 mcode, U8 mcode2, const LLUUID &uuid); | 152 | BOOL addRollingSound(U8 mcode, U8 mcode2, const LLUUID &uuid); |
@@ -160,10 +156,10 @@ public: | |||
160 | BOOL addRestitution(U8 mcode, const F32 &restitution); | 156 | BOOL addRestitution(U8 mcode, const F32 &restitution); |
161 | BOOL addDamageAndEnergy(U8 mcode, const F32 &hp_mod, const F32 &damage_mod, const F32 &ep_mod); | 157 | BOOL addDamageAndEnergy(U8 mcode, const F32 &hp_mod, const F32 &damage_mod, const F32 &ep_mod); |
162 | 158 | ||
163 | LLUUID getDefaultTextureID(char* name); // LLUUID::null if not found | 159 | LLUUID getDefaultTextureID(const std::string& name); // LLUUID::null if not found |
164 | LLUUID getDefaultTextureID(U8 mcode); // LLUUID::null if not found | 160 | LLUUID getDefaultTextureID(U8 mcode); // LLUUID::null if not found |
165 | U8 getMCode(const char* name); // 0 if not found | 161 | U8 getMCode(const std::string& name); // 0 if not found |
166 | char* getName(U8 mcode); | 162 | std::string getName(U8 mcode); |
167 | 163 | ||
168 | F32 getDensity(U8 mcode); // kg/m^3, 0 if not found | 164 | F32 getDensity(U8 mcode); // kg/m^3, 0 if not found |
169 | F32 getFriction(U8 mcode); // physics values | 165 | F32 getFriction(U8 mcode); // physics values |
diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp index 3ddf92e..bbfa53e 100644 --- a/linden/indra/llprimitive/llprimitive.cpp +++ b/linden/indra/llprimitive/llprimitive.cpp | |||
@@ -760,15 +760,14 @@ U8 LLPrimitive::pCodeToLegacy(const LLPCode pcode) | |||
760 | 760 | ||
761 | // static | 761 | // static |
762 | // Don't crash or llerrs here! This function is used for debug strings. | 762 | // Don't crash or llerrs here! This function is used for debug strings. |
763 | const char * LLPrimitive::pCodeToString(const LLPCode pcode) | 763 | std::string LLPrimitive::pCodeToString(const LLPCode pcode) |
764 | { | 764 | { |
765 | static char pcode_string[255]; /* Flawfinder: ignore */ | 765 | std::string pcode_string; |
766 | 766 | ||
767 | U8 base_code = pcode & LL_PCODE_BASE_MASK; | 767 | U8 base_code = pcode & LL_PCODE_BASE_MASK; |
768 | pcode_string[0] = 0; | ||
769 | if (!pcode) | 768 | if (!pcode) |
770 | { | 769 | { |
771 | snprintf(pcode_string, sizeof(pcode_string), "null"); /* Flawfinder: ignore */ | 770 | pcode_string = "null"; |
772 | } | 771 | } |
773 | else if ((base_code) == LL_PCODE_LEGACY) | 772 | else if ((base_code) == LL_PCODE_LEGACY) |
774 | { | 773 | { |
@@ -776,66 +775,66 @@ const char * LLPrimitive::pCodeToString(const LLPCode pcode) | |||
776 | switch (pcode) | 775 | switch (pcode) |
777 | { | 776 | { |
778 | case LL_PCODE_LEGACY_GRASS: | 777 | case LL_PCODE_LEGACY_GRASS: |
779 | snprintf(pcode_string, sizeof(pcode_string), "grass"); /* Flawfinder: ignore */ | 778 | pcode_string = "grass"; |
780 | break; | 779 | break; |
781 | case LL_PCODE_LEGACY_PART_SYS: | 780 | case LL_PCODE_LEGACY_PART_SYS: |
782 | snprintf(pcode_string, sizeof(pcode_string), "particle system"); /* Flawfinder: ignore */ | 781 | pcode_string = "particle system"; |
783 | break; | 782 | break; |
784 | case LL_PCODE_LEGACY_AVATAR: | 783 | case LL_PCODE_LEGACY_AVATAR: |
785 | snprintf(pcode_string, sizeof(pcode_string), "avatar"); /* Flawfinder: ignore */ | 784 | pcode_string = "avatar"; |
786 | break; | 785 | break; |
787 | case LL_PCODE_LEGACY_TEXT_BUBBLE: | 786 | case LL_PCODE_LEGACY_TEXT_BUBBLE: |
788 | snprintf(pcode_string, sizeof(pcode_string), "text bubble"); /* Flawfinder: ignore */ | 787 | pcode_string = "text bubble"; |
789 | break; | 788 | break; |
790 | case LL_PCODE_LEGACY_TREE: | 789 | case LL_PCODE_LEGACY_TREE: |
791 | snprintf(pcode_string, sizeof(pcode_string), "tree"); /* Flawfinder: ignore */ | 790 | pcode_string = "tree"; |
792 | break; | 791 | break; |
793 | case LL_PCODE_TREE_NEW: | 792 | case LL_PCODE_TREE_NEW: |
794 | snprintf(pcode_string, sizeof(pcode_string), "tree_new"); /* Flawfinder: ignore */ | 793 | pcode_string = "tree_new"; |
795 | break; | 794 | break; |
796 | default: | 795 | default: |
797 | snprintf(pcode_string, sizeof(pcode_string), "unknown legacy pcode %i",(U32)pcode); /* Flawfinder: ignore */ | 796 | pcode_string = llformat( "unknown legacy pcode %i",(U32)pcode); |
798 | } | 797 | } |
799 | } | 798 | } |
800 | else | 799 | else |
801 | { | 800 | { |
802 | char shape[32]; /* Flawfinder: ignore */ | 801 | std::string shape; |
803 | char mask[32]; /* Flawfinder: ignore */ | 802 | std::string mask; |
804 | if (base_code == LL_PCODE_CUBE) | 803 | if (base_code == LL_PCODE_CUBE) |
805 | { | 804 | { |
806 | snprintf(shape, sizeof(shape), "cube"); /* Flawfinder: ignore */ | 805 | shape = "cube"; |
807 | } | 806 | } |
808 | else if (base_code == LL_PCODE_CYLINDER) | 807 | else if (base_code == LL_PCODE_CYLINDER) |
809 | { | 808 | { |
810 | snprintf(shape, sizeof(shape), "cylinder"); /* Flawfinder: ignore */ | 809 | shape = "cylinder"; |
811 | } | 810 | } |
812 | else if (base_code == LL_PCODE_CONE) | 811 | else if (base_code == LL_PCODE_CONE) |
813 | { | 812 | { |
814 | snprintf(shape, sizeof(shape), "cone"); /* Flawfinder: ignore */ | 813 | shape = "cone"; |
815 | } | 814 | } |
816 | else if (base_code == LL_PCODE_PRISM) | 815 | else if (base_code == LL_PCODE_PRISM) |
817 | { | 816 | { |
818 | snprintf(shape, sizeof(shape), "prism"); /* Flawfinder: ignore */ | 817 | shape = "prism"; |
819 | } | 818 | } |
820 | else if (base_code == LL_PCODE_PYRAMID) | 819 | else if (base_code == LL_PCODE_PYRAMID) |
821 | { | 820 | { |
822 | snprintf(shape, sizeof(shape), "pyramid"); /* Flawfinder: ignore */ | 821 | shape = "pyramid"; |
823 | } | 822 | } |
824 | else if (base_code == LL_PCODE_SPHERE) | 823 | else if (base_code == LL_PCODE_SPHERE) |
825 | { | 824 | { |
826 | snprintf(shape, sizeof(shape), "sphere"); /* Flawfinder: ignore */ | 825 | shape = "sphere"; |
827 | } | 826 | } |
828 | else if (base_code == LL_PCODE_TETRAHEDRON) | 827 | else if (base_code == LL_PCODE_TETRAHEDRON) |
829 | { | 828 | { |
830 | snprintf(shape, sizeof(shape), "tetrahedron"); /* Flawfinder: ignore */ | 829 | shape = "tetrahedron"; |
831 | } | 830 | } |
832 | else if (base_code == LL_PCODE_VOLUME) | 831 | else if (base_code == LL_PCODE_VOLUME) |
833 | { | 832 | { |
834 | snprintf(shape, sizeof(shape), "volume"); /* Flawfinder: ignore */ | 833 | shape = "volume"; |
835 | } | 834 | } |
836 | else if (base_code == LL_PCODE_APP) | 835 | else if (base_code == LL_PCODE_APP) |
837 | { | 836 | { |
838 | snprintf(shape, sizeof(shape), "app"); /* Flawfinder: ignore */ | 837 | shape = "app"; |
839 | } | 838 | } |
840 | else | 839 | else |
841 | { | 840 | { |
@@ -845,35 +844,27 @@ const char * LLPrimitive::pCodeToString(const LLPCode pcode) | |||
845 | U8 mask_code = pcode & (~LL_PCODE_BASE_MASK); | 844 | U8 mask_code = pcode & (~LL_PCODE_BASE_MASK); |
846 | if (base_code == LL_PCODE_APP) | 845 | if (base_code == LL_PCODE_APP) |
847 | { | 846 | { |
848 | snprintf(mask, sizeof(mask), "%x", mask_code); /* Flawfinder: ignore */ | 847 | mask = llformat( "%x", mask_code); |
849 | } | 848 | } |
850 | else if (mask_code & LL_PCODE_HEMI_MASK) | 849 | else if (mask_code & LL_PCODE_HEMI_MASK) |
851 | { | 850 | { |
852 | snprintf(mask, sizeof(mask), "hemi"); /* Flawfinder: ignore */ | 851 | mask = "hemi"; |
853 | } | 852 | } |
854 | else | 853 | else |
855 | { | 854 | { |
856 | snprintf(mask, sizeof(mask), "%x", mask_code); /* Flawfinder: ignore */ | 855 | mask = llformat( "%x", mask_code); |
857 | } | 856 | } |
858 | 857 | ||
859 | // extra sanity against snprintf() being naturally crap | ||
860 | mask[sizeof(mask)-1] = '\0'; | ||
861 | shape[sizeof(shape)-1] = '\0'; | ||
862 | |||
863 | if (mask[0]) | 858 | if (mask[0]) |
864 | { | 859 | { |
865 | snprintf(pcode_string, sizeof(pcode_string), "%s-%s", shape, mask); /* Flawfinder: ignore */ | 860 | pcode_string = llformat( "%s-%s", shape.c_str(), mask.c_str()); |
866 | } | 861 | } |
867 | else | 862 | else |
868 | { | 863 | { |
869 | snprintf(pcode_string, sizeof(pcode_string), "%s", shape); /* Flawfinder: ignore */ | 864 | pcode_string = llformat( "%s", shape.c_str()); |
870 | } | 865 | } |
871 | } | 866 | } |
872 | 867 | ||
873 | // Be really sure that pcode_string is nul-terminated after we've | ||
874 | // been using crappy snprintf() to build it. | ||
875 | pcode_string[sizeof(pcode_string)-1] = '\0'; | ||
876 | |||
877 | return pcode_string; | 868 | return pcode_string; |
878 | } | 869 | } |
879 | 870 | ||
@@ -993,7 +984,7 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai | |||
993 | S32 i; | 984 | S32 i; |
994 | 985 | ||
995 | /* | 986 | /* |
996 | LLString old_mask_string; | 987 | std::string old_mask_string; |
997 | for (i = 0; i < 9; i++) | 988 | for (i = 0; i < 9; i++) |
998 | { | 989 | { |
999 | if (old_face_mask & (1 << i)) | 990 | if (old_face_mask & (1 << i)) |
@@ -1005,7 +996,7 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai | |||
1005 | old_mask_string.append("0"); | 996 | old_mask_string.append("0"); |
1006 | } | 997 | } |
1007 | } | 998 | } |
1008 | LLString new_mask_string; | 999 | std::string new_mask_string; |
1009 | for (i = 0; i < 9; i++) | 1000 | for (i = 0; i < 9; i++) |
1010 | { | 1001 | { |
1011 | if (new_face_mask & (1 << i)) | 1002 | if (new_face_mask & (1 << i)) |
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h index e698a31..82df35c 100644 --- a/linden/indra/llprimitive/llprimitive.h +++ b/linden/indra/llprimitive/llprimitive.h | |||
@@ -378,7 +378,7 @@ public: | |||
378 | #endif | 378 | #endif |
379 | 379 | ||
380 | LLPCode getPCode() const { return mPrimitiveCode; } | 380 | LLPCode getPCode() const { return mPrimitiveCode; } |
381 | const char * getPCodeString() const { return pCodeToString(mPrimitiveCode); } | 381 | std::string getPCodeString() const { return pCodeToString(mPrimitiveCode); } |
382 | const LLVector3& getAngularVelocity() const { return mAngularVelocity; } | 382 | const LLVector3& getAngularVelocity() const { return mAngularVelocity; } |
383 | const LLVector3& getVelocity() const { return mVelocity; } | 383 | const LLVector3& getVelocity() const { return mVelocity; } |
384 | const LLVector3& getAcceleration() const { return mAcceleration; } | 384 | const LLVector3& getAcceleration() const { return mAcceleration; } |
@@ -400,7 +400,7 @@ public: | |||
400 | void removeFlags(U32 flags) { mMiscFlags &= ~flags; } | 400 | void removeFlags(U32 flags) { mMiscFlags &= ~flags; } |
401 | U32 getFlags() const { return mMiscFlags; } | 401 | U32 getFlags() const { return mMiscFlags; } |
402 | 402 | ||
403 | static const char *pCodeToString(const LLPCode pcode); | 403 | static std::string pCodeToString(const LLPCode pcode); |
404 | static LLPCode legacyToPCode(const U8 legacy); | 404 | static LLPCode legacyToPCode(const U8 legacy); |
405 | static U8 pCodeToLegacy(const LLPCode pcode); | 405 | static U8 pCodeToLegacy(const LLPCode pcode); |
406 | static bool getTESTAxes(const U8 face, U32* s_axis, U32* t_axis); | 406 | static bool getTESTAxes(const U8 face, U32* s_axis, U32* t_axis); |
diff --git a/linden/indra/llprimitive/llprimitive.vcproj b/linden/indra/llprimitive/llprimitive.vcproj deleted file mode 100644 index 620ace4..0000000 --- a/linden/indra/llprimitive/llprimitive.vcproj +++ /dev/null | |||
@@ -1,224 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | ||
2 | <VisualStudioProject | ||
3 | ProjectType="Visual C++" | ||
4 | Version="7.10" | ||
5 | Name="llprimitive" | ||
6 | ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}" | ||
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="..\;..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include" | ||
23 | PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;LL_CURRENT_HAVOK_VERSION=460" | ||
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)/llprimitive.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="..\;..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\" | ||
68 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;LL_CURRENT_HAVOK_VERSION=460" | ||
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)/llprimitive.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="..\;..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include" | ||
112 | PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;LL_CURRENT_HAVOK_VERSION=460" | ||
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)/llprimitive.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=".\llmaterialtable.cpp"> | ||
155 | </File> | ||
156 | <File | ||
157 | RelativePath=".\llprimitive.cpp"> | ||
158 | </File> | ||
159 | <File | ||
160 | RelativePath=".\lltextureanim.cpp"> | ||
161 | </File> | ||
162 | <File | ||
163 | RelativePath=".\lltextureentry.cpp"> | ||
164 | </File> | ||
165 | <File | ||
166 | RelativePath=".\lltreeparams.cpp"> | ||
167 | </File> | ||
168 | <File | ||
169 | RelativePath=".\llvolumemessage.cpp"> | ||
170 | </File> | ||
171 | <File | ||
172 | RelativePath=".\llvolumexml.cpp"> | ||
173 | </File> | ||
174 | </Filter> | ||
175 | <Filter | ||
176 | Name="Header Files" | ||
177 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
178 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> | ||
179 | <File | ||
180 | RelativePath=".\legacy_object_types.h"> | ||
181 | </File> | ||
182 | <File | ||
183 | RelativePath=".\llmaterialtable.h"> | ||
184 | </File> | ||
185 | <File | ||
186 | RelativePath=".\llprimitive.h"> | ||
187 | </File> | ||
188 | <File | ||
189 | RelativePath=".\llprimlinkinfo.h"> | ||
190 | </File> | ||
191 | <File | ||
192 | RelativePath=".\lltextureanim.h"> | ||
193 | </File> | ||
194 | <File | ||
195 | RelativePath=".\lltextureentry.h"> | ||
196 | </File> | ||
197 | <File | ||
198 | RelativePath=".\lltree_common.h"> | ||
199 | </File> | ||
200 | <File | ||
201 | RelativePath=".\lltreeparams.h"> | ||
202 | </File> | ||
203 | <File | ||
204 | RelativePath=".\llvolumemessage.h"> | ||
205 | </File> | ||
206 | <File | ||
207 | RelativePath=".\llvolumexml.h"> | ||
208 | </File> | ||
209 | <File | ||
210 | RelativePath=".\material_codes.h"> | ||
211 | </File> | ||
212 | <File | ||
213 | RelativePath=".\object_flags.h"> | ||
214 | </File> | ||
215 | </Filter> | ||
216 | <Filter | ||
217 | Name="Resource Files" | ||
218 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | ||
219 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> | ||
220 | </Filter> | ||
221 | </Files> | ||
222 | <Globals> | ||
223 | </Globals> | ||
224 | </VisualStudioProject> | ||
diff --git a/linden/indra/llprimitive/llprimitive_vc8.vcproj b/linden/indra/llprimitive/llprimitive_vc8.vcproj deleted file mode 100644 index 860f88a..0000000 --- a/linden/indra/llprimitive/llprimitive_vc8.vcproj +++ /dev/null | |||
@@ -1,319 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | ||
2 | <VisualStudioProject | ||
3 | ProjectType="Visual C++" | ||
4 | Version="8.00" | ||
5 | Name="llprimitive" | ||
6 | ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}" | ||
7 | RootNamespace="llprimitive" | ||
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="..\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" | ||
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)/llprimitive.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="..\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" | ||
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)/llprimitive.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="..\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" | ||
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)/llprimitive.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=".\llmaterialtable.cpp" | ||
233 | > | ||
234 | </File> | ||
235 | <File | ||
236 | RelativePath=".\llprimitive.cpp" | ||
237 | > | ||
238 | </File> | ||
239 | <File | ||
240 | RelativePath=".\lltextureanim.cpp" | ||
241 | > | ||
242 | </File> | ||
243 | <File | ||
244 | RelativePath=".\lltextureentry.cpp" | ||
245 | > | ||
246 | </File> | ||
247 | <File | ||
248 | RelativePath=".\lltreeparams.cpp" | ||
249 | > | ||
250 | </File> | ||
251 | <File | ||
252 | RelativePath=".\llvolumemessage.cpp" | ||
253 | > | ||
254 | </File> | ||
255 | <File | ||
256 | RelativePath=".\llvolumexml.cpp" | ||
257 | > | ||
258 | </File> | ||
259 | </Filter> | ||
260 | <Filter | ||
261 | Name="Header Files" | ||
262 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
263 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
264 | > | ||
265 | <File | ||
266 | RelativePath=".\legacy_object_types.h" | ||
267 | > | ||
268 | </File> | ||
269 | <File | ||
270 | RelativePath=".\llmaterialtable.h" | ||
271 | > | ||
272 | </File> | ||
273 | <File | ||
274 | RelativePath=".\llprimitive.h" | ||
275 | > | ||
276 | </File> | ||
277 | <File | ||
278 | RelativePath=".\lltextureanim.h" | ||
279 | > | ||
280 | </File> | ||
281 | <File | ||
282 | RelativePath=".\lltextureentry.h" | ||
283 | > | ||
284 | </File> | ||
285 | <File | ||
286 | RelativePath=".\lltree_common.h" | ||
287 | > | ||
288 | </File> | ||
289 | <File | ||
290 | RelativePath=".\lltreeparams.h" | ||
291 | > | ||
292 | </File> | ||
293 | <File | ||
294 | RelativePath=".\llvolumemessage.h" | ||
295 | > | ||
296 | </File> | ||
297 | <File | ||
298 | RelativePath=".\llvolumexml.h" | ||
299 | > | ||
300 | </File> | ||
301 | <File | ||
302 | RelativePath=".\material_codes.h" | ||
303 | > | ||
304 | </File> | ||
305 | <File | ||
306 | RelativePath=".\object_flags.h" | ||
307 | > | ||
308 | </File> | ||
309 | </Filter> | ||
310 | <Filter | ||
311 | Name="Resource Files" | ||
312 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | ||
313 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
314 | > | ||
315 | </Filter> | ||
316 | </Files> | ||
317 | <Globals> | ||
318 | </Globals> | ||
319 | </VisualStudioProject> | ||
diff --git a/linden/indra/llprimitive/llprimitive_vc9.vcproj b/linden/indra/llprimitive/llprimitive_vc9.vcproj deleted file mode 100644 index 1e04970..0000000 --- a/linden/indra/llprimitive/llprimitive_vc9.vcproj +++ /dev/null | |||
@@ -1,320 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | ||
2 | <VisualStudioProject | ||
3 | ProjectType="Visual C++" | ||
4 | Version="9.00" | ||
5 | Name="llprimitive" | ||
6 | ProjectGUID="{FCC4483C-5B84-4944-B91F-4589A219BC0B}" | ||
7 | RootNamespace="llprimitive" | ||
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="..\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" | ||
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)/llprimitive.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="..\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" | ||
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)/llprimitive.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="..\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" | ||
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)/llprimitive.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=".\llmaterialtable.cpp" | ||
234 | > | ||
235 | </File> | ||
236 | <File | ||
237 | RelativePath=".\llprimitive.cpp" | ||
238 | > | ||
239 | </File> | ||
240 | <File | ||
241 | RelativePath=".\lltextureanim.cpp" | ||
242 | > | ||
243 | </File> | ||
244 | <File | ||
245 | RelativePath=".\lltextureentry.cpp" | ||
246 | > | ||
247 | </File> | ||
248 | <File | ||
249 | RelativePath=".\lltreeparams.cpp" | ||
250 | > | ||
251 | </File> | ||
252 | <File | ||
253 | RelativePath=".\llvolumemessage.cpp" | ||
254 | > | ||
255 | </File> | ||
256 | <File | ||
257 | RelativePath=".\llvolumexml.cpp" | ||
258 | > | ||
259 | </File> | ||
260 | </Filter> | ||
261 | <Filter | ||
262 | Name="Header Files" | ||
263 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
264 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
265 | > | ||
266 | <File | ||
267 | RelativePath=".\legacy_object_types.h" | ||
268 | > | ||
269 | </File> | ||
270 | <File | ||
271 | RelativePath=".\llmaterialtable.h" | ||
272 | > | ||
273 | </File> | ||
274 | <File | ||
275 | RelativePath=".\llprimitive.h" | ||
276 | > | ||
277 | </File> | ||
278 | <File | ||
279 | RelativePath=".\lltextureanim.h" | ||
280 | > | ||
281 | </File> | ||
282 | <File | ||
283 | RelativePath=".\lltextureentry.h" | ||
284 | > | ||
285 | </File> | ||
286 | <File | ||
287 | RelativePath=".\lltree_common.h" | ||
288 | > | ||
289 | </File> | ||
290 | <File | ||
291 | RelativePath=".\lltreeparams.h" | ||
292 | > | ||
293 | </File> | ||
294 | <File | ||
295 | RelativePath=".\llvolumemessage.h" | ||
296 | > | ||
297 | </File> | ||
298 | <File | ||
299 | RelativePath=".\llvolumexml.h" | ||
300 | > | ||
301 | </File> | ||
302 | <File | ||
303 | RelativePath=".\material_codes.h" | ||
304 | > | ||
305 | </File> | ||
306 | <File | ||
307 | RelativePath=".\object_flags.h" | ||
308 | > | ||
309 | </File> | ||
310 | </Filter> | ||
311 | <Filter | ||
312 | Name="Resource Files" | ||
313 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" | ||
314 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
315 | > | ||
316 | </Filter> | ||
317 | </Files> | ||
318 | <Globals> | ||
319 | </Globals> | ||
320 | </VisualStudioProject> | ||