diff options
| author | David Walter Seikel | 2013-04-08 04:23:24 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-04-08 04:23:24 +1000 |
| commit | f2869c821a0bfef53000ba1116f64198ead4297e (patch) | |
| tree | d5c020d243870089da911137031965dff22f526b | |
| parent | Update grid list to match Kokua, and sort them. (diff) | |
| download | meta-impy-f2869c821a0bfef53000ba1116f64198ead4297e.zip meta-impy-f2869c821a0bfef53000ba1116f64198ead4297e.tar.gz meta-impy-f2869c821a0bfef53000ba1116f64198ead4297e.tar.bz2 meta-impy-f2869c821a0bfef53000ba1116f64198ead4297e.tar.xz | |
Material UUIDs are defined in two places, deleted one.
| -rwxr-xr-x | linden/indra/llprimitive/llmaterialtable.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/linden/indra/llprimitive/llmaterialtable.cpp b/linden/indra/llprimitive/llmaterialtable.cpp index 7dd764e..f06bfe8 100755 --- a/linden/indra/llprimitive/llmaterialtable.cpp +++ b/linden/indra/llprimitive/llmaterialtable.cpp | |||
| @@ -40,16 +40,6 @@ | |||
| 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 | |||
| 53 | /* | 43 | /* |
| 54 | Old Havok 1 constants | 44 | Old Havok 1 constants |
| 55 | 45 | ||