diff options
| author | Aleric Inglewood | 2010-09-28 03:06:39 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-09-28 03:06:39 +0200 |
| commit | 8ff7b0feedddcf8e7356a0150aa4953a0172fb78 (patch) | |
| tree | fe1933f4a9d7d072c04832012731d96152a2ac1e /linden/indra/llprimitive/llmaterialtable.cpp | |
| parent | RED-554: SNOW-623: Add support for boost 1.42 (diff) | |
| download | meta-impy-8ff7b0feedddcf8e7356a0150aa4953a0172fb78.zip meta-impy-8ff7b0feedddcf8e7356a0150aa4953a0172fb78.tar.gz meta-impy-8ff7b0feedddcf8e7356a0150aa4953a0172fb78.tar.bz2 meta-impy-8ff7b0feedddcf8e7356a0150aa4953a0172fb78.tar.xz | |
RED-556: SNOW-800: Massively duplicated objects
See http://redmine.imprudenceviewer.org/issues/556
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llprimitive/llmaterialtable.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/llprimitive/llmaterialtable.cpp b/linden/indra/llprimitive/llmaterialtable.cpp index 4c22203..92eef96 100644 --- a/linden/indra/llprimitive/llmaterialtable.cpp +++ b/linden/indra/llprimitive/llmaterialtable.cpp | |||
| @@ -40,6 +40,16 @@ | |||
| 40 | 40 | ||
| 41 | LLMaterialTable LLMaterialTable::basic(1); | 41 | LLMaterialTable LLMaterialTable::basic(1); |
| 42 | 42 | ||
| 43 | // Material UUIDs. | ||
| 44 | LLUUID const LL_DEFAULT_STONE_UUID("87c5765b-aa26-43eb-b8c6-c09a1ca6208e"); | ||
| 45 | LLUUID const LL_DEFAULT_METAL_UUID("6f3c53e9-ba60-4010-8f3e-30f51a762476"); | ||
| 46 | LLUUID const LL_DEFAULT_GLASS_UUID("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d"); | ||
| 47 | LLUUID const LL_DEFAULT_WOOD_UUID("89556747-24cb-43ed-920b-47caed15465f"); | ||
| 48 | LLUUID const LL_DEFAULT_FLESH_UUID("80736669-e4b9-450e-8890-d5169f988a50"); | ||
| 49 | LLUUID const LL_DEFAULT_PLASTIC_UUID("304fcb4e-7d33-4339-ba80-76d3d22dc11a"); | ||
| 50 | LLUUID const LL_DEFAULT_RUBBER_UUID("9fae0bc5-666d-477e-9f70-84e8556ec867"); | ||
| 51 | LLUUID const LL_DEFAULT_LIGHT_UUID("00000000-0000-0000-0000-000000000000"); | ||
| 52 | |||
| 43 | /* | 53 | /* |
| 44 | Old Havok 1 constants | 54 | Old Havok 1 constants |
| 45 | 55 | ||