From 8ff7b0feedddcf8e7356a0150aa4953a0172fb78 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Tue, 28 Sep 2010 03:06:39 +0200 Subject: RED-556: SNOW-800: Massively duplicated objects See http://redmine.imprudenceviewer.org/issues/556 --- linden/indra/llcharacter/llanimationstates.cpp | 136 +++++++ linden/indra/llcharacter/llanimationstates.h | 271 +++++++------- linden/indra/llcommon/CMakeLists.txt | 2 + linden/indra/llcommon/imageids.cpp | 77 ++++ linden/indra/llcommon/imageids.h | 57 ++- linden/indra/llcommon/indra_constants.cpp | 47 +++ linden/indra/llcommon/indra_constants.h | 17 +- linden/indra/llcommon/lldate.cpp | 2 + linden/indra/llcommon/lldate.h | 5 - linden/indra/llcommon/lllslconstants.h | 3 - linden/indra/llmath/llcamera.cpp | 1 + linden/indra/llmath/llcamera.h | 9 - linden/indra/llmessage/CMakeLists.txt | 1 + linden/indra/llmessage/sound_ids.cpp | 290 +++++++++++++++ linden/indra/llmessage/sound_ids.h | 497 ++++++++++++------------- linden/indra/llprimitive/llmaterialtable.cpp | 10 + linden/indra/llprimitive/material_codes.h | 16 +- linden/indra/llui/lluixmltags.h | 192 +++++----- linden/indra/newview/llvoavatar.cpp | 16 +- linden/indra/newview/llvosky.cpp | 6 +- linden/indra/newview/llvosky.h | 7 +- 21 files changed, 1096 insertions(+), 566 deletions(-) create mode 100644 linden/indra/llcommon/imageids.cpp create mode 100644 linden/indra/llcommon/indra_constants.cpp create mode 100644 linden/indra/llmessage/sound_ids.cpp (limited to 'linden') diff --git a/linden/indra/llcharacter/llanimationstates.cpp b/linden/indra/llcharacter/llanimationstates.cpp index 365fb67..b6d4057 100644 --- a/linden/indra/llcharacter/llanimationstates.cpp +++ b/linden/indra/llcharacter/llanimationstates.cpp @@ -39,6 +39,142 @@ #include "llanimationstates.h" #include "llstring.h" +LLUUID const ANIM_AGENT_AFRAID ("6b61c8e8-4747-0d75-12d7-e49ff207a4ca"); +LLUUID const ANIM_AGENT_AIM_BAZOOKA_R ("b5b4a67d-0aee-30d2-72cd-77b333e932ef"); +LLUUID const ANIM_AGENT_AIM_BOW_L ("46bb4359-de38-4ed8-6a22-f1f52fe8f506"); +LLUUID const ANIM_AGENT_AIM_HANDGUN_R ("3147d815-6338-b932-f011-16b56d9ac18b"); +LLUUID const ANIM_AGENT_AIM_RIFLE_R ("ea633413-8006-180a-c3ba-96dd1d756720"); +LLUUID const ANIM_AGENT_ANGRY ("5747a48e-073e-c331-f6f3-7c2149613d3e"); +LLUUID const ANIM_AGENT_AWAY ("fd037134-85d4-f241-72c6-4f42164fedee"); +LLUUID const ANIM_AGENT_BACKFLIP ("c4ca6188-9127-4f31-0158-23c4e2f93304"); +LLUUID const ANIM_AGENT_BELLY_LAUGH ("18b3a4b5-b463-bd48-e4b6-71eaac76c515"); +LLUUID const ANIM_AGENT_BLOW_KISS ("db84829b-462c-ee83-1e27-9bbee66bd624"); +LLUUID const ANIM_AGENT_BORED ("b906c4ba-703b-1940-32a3-0c7f7d791510"); +LLUUID const ANIM_AGENT_BOW ("82e99230-c906-1403-4d9c-3889dd98daba"); +LLUUID const ANIM_AGENT_BRUSH ("349a3801-54f9-bf2c-3bd0-1ac89772af01"); +LLUUID const ANIM_AGENT_BUSY ("efcf670c-2d18-8128-973a-034ebc806b67"); +LLUUID const ANIM_AGENT_CLAP ("9b0c1c4e-8ac7-7969-1494-28c874c4f668"); +LLUUID const ANIM_AGENT_COURTBOW ("9ba1c942-08be-e43a-fb29-16ad440efc50"); +LLUUID const ANIM_AGENT_CROUCH ("201f3fdf-cb1f-dbec-201f-7333e328ae7c"); +LLUUID const ANIM_AGENT_CROUCHWALK ("47f5f6fb-22e5-ae44-f871-73aaaf4a6022"); +LLUUID const ANIM_AGENT_CRY ("92624d3e-1068-f1aa-a5ec-8244585193ed"); +LLUUID const ANIM_AGENT_CUSTOMIZE ("038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53"); +LLUUID const ANIM_AGENT_CUSTOMIZE_DONE ("6883a61a-b27b-5914-a61e-dda118a9ee2c"); +LLUUID const ANIM_AGENT_DANCE1 ("b68a3d7c-de9e-fc87-eec8-543d787e5b0d"); +LLUUID const ANIM_AGENT_DANCE2 ("928cae18-e31d-76fd-9cc9-2f55160ff818"); +LLUUID const ANIM_AGENT_DANCE3 ("30047778-10ea-1af7-6881-4db7a3a5a114"); +LLUUID const ANIM_AGENT_DANCE4 ("951469f4-c7b2-c818-9dee-ad7eea8c30b7"); +LLUUID const ANIM_AGENT_DANCE5 ("4bd69a1d-1114-a0b4-625f-84e0a5237155"); +LLUUID const ANIM_AGENT_DANCE6 ("cd28b69b-9c95-bb78-3f94-8d605ff1bb12"); +LLUUID const ANIM_AGENT_DANCE7 ("a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6"); +LLUUID const ANIM_AGENT_DANCE8 ("b0dc417c-1f11-af36-2e80-7e7489fa7cdc"); +LLUUID const ANIM_AGENT_DEAD ("57abaae6-1d17-7b1b-5f98-6d11a6411276"); +LLUUID const ANIM_AGENT_DRINK ("0f86e355-dd31-a61c-fdb0-3a96b9aad05f"); +LLUUID const ANIM_AGENT_EMBARRASSED ("514af488-9051-044a-b3fc-d4dbf76377c6"); +LLUUID const ANIM_AGENT_EXPRESS_AFRAID ("aa2df84d-cf8f-7218-527b-424a52de766e"); +LLUUID const ANIM_AGENT_EXPRESS_ANGER ("1a03b575-9634-b62a-5767-3a679e81f4de"); +LLUUID const ANIM_AGENT_EXPRESS_BORED ("214aa6c1-ba6a-4578-f27c-ce7688f61d0d"); +LLUUID const ANIM_AGENT_EXPRESS_CRY ("d535471b-85bf-3b4d-a542-93bea4f59d33"); +LLUUID const ANIM_AGENT_EXPRESS_DISDAIN ("d4416ff1-09d3-300f-4183-1b68a19b9fc1"); +LLUUID const ANIM_AGENT_EXPRESS_EMBARRASSED ("0b8c8211-d78c-33e8-fa28-c51a9594e424"); +LLUUID const ANIM_AGENT_EXPRESS_FROWN ("fee3df48-fa3d-1015-1e26-a205810e3001"); +LLUUID const ANIM_AGENT_EXPRESS_KISS ("1e8d90cc-a84e-e135-884c-7c82c8b03a14"); +LLUUID const ANIM_AGENT_EXPRESS_LAUGH ("62570842-0950-96f8-341c-809e65110823"); +LLUUID const ANIM_AGENT_EXPRESS_OPEN_MOUTH ("d63bc1f9-fc81-9625-a0c6-007176d82eb7"); +LLUUID const ANIM_AGENT_EXPRESS_REPULSED ("f76cda94-41d4-a229-2872-e0296e58afe1"); +LLUUID const ANIM_AGENT_EXPRESS_SAD ("eb6ebfb2-a4b3-a19c-d388-4dd5c03823f7"); +LLUUID const ANIM_AGENT_EXPRESS_SHRUG ("a351b1bc-cc94-aac2-7bea-a7e6ebad15ef"); +LLUUID const ANIM_AGENT_EXPRESS_SMILE ("b7c7c833-e3d3-c4e3-9fc0-131237446312"); +LLUUID const ANIM_AGENT_EXPRESS_SURPRISE ("728646d9-cc79-08b2-32d6-937f0a835c24"); +LLUUID const ANIM_AGENT_EXPRESS_TONGUE_OUT ("835965c6-7f2f-bda2-5deb-2478737f91bf"); +LLUUID const ANIM_AGENT_EXPRESS_TOOTHSMILE ("b92ec1a5-e7ce-a76b-2b05-bcdb9311417e"); +LLUUID const ANIM_AGENT_EXPRESS_WINK ("da020525-4d94-59d6-23d7-81fdebf33148"); +LLUUID const ANIM_AGENT_EXPRESS_WORRY ("9c05e5c7-6f07-6ca4-ed5a-b230390c3950"); +LLUUID const ANIM_AGENT_FALLDOWN ("666307d9-a860-572d-6fd4-c3ab8865c094"); +LLUUID const ANIM_AGENT_FEMALE_WALK ("f5fc7433-043d-e819-8298-f519a119b688"); +LLUUID const ANIM_AGENT_FINGER_WAG ("c1bc7f36-3ba0-d844-f93c-93be945d644f"); +LLUUID const ANIM_AGENT_FIST_PUMP ("7db00ccd-f380-f3ee-439d-61968ec69c8a"); +LLUUID const ANIM_AGENT_FLY ("aec4610c-757f-bc4e-c092-c6e9caf18daf"); +LLUUID const ANIM_AGENT_FLYSLOW ("2b5a38b2-5e00-3a97-a495-4c826bc443e6"); +LLUUID const ANIM_AGENT_HELLO ("9b29cd61-c45b-5689-ded2-91756b8d76a9"); +LLUUID const ANIM_AGENT_HOLD_BAZOOKA_R ("ef62d355-c815-4816-2474-b1acc21094a6"); +LLUUID const ANIM_AGENT_HOLD_BOW_L ("8b102617-bcba-037b-86c1-b76219f90c88"); +LLUUID const ANIM_AGENT_HOLD_HANDGUN_R ("efdc1727-8b8a-c800-4077-975fc27ee2f2"); +LLUUID const ANIM_AGENT_HOLD_RIFLE_R ("3d94bad0-c55b-7dcc-8763-033c59405d33"); +LLUUID const ANIM_AGENT_HOLD_THROW_R ("7570c7b5-1f22-56dd-56ef-a9168241bbb6"); +LLUUID const ANIM_AGENT_HOVER ("4ae8016b-31b9-03bb-c401-b1ea941db41d"); +LLUUID const ANIM_AGENT_HOVER_DOWN ("20f063ea-8306-2562-0b07-5c853b37b31e"); +LLUUID const ANIM_AGENT_HOVER_UP ("62c5de58-cb33-5743-3d07-9e4cd4352864"); +LLUUID const ANIM_AGENT_IMPATIENT ("5ea3991f-c293-392e-6860-91dfa01278a3"); +LLUUID const ANIM_AGENT_JUMP ("2305bd75-1ca9-b03b-1faa-b176b8a8c49e"); +LLUUID const ANIM_AGENT_JUMP_FOR_JOY ("709ea28e-1573-c023-8bf8-520c8bc637fa"); +LLUUID const ANIM_AGENT_KISS_MY_BUTT ("19999406-3a3a-d58c-a2ac-d72e555dcf51"); +LLUUID const ANIM_AGENT_LAND ("7a17b059-12b2-41b1-570a-186368b6aa6f"); +LLUUID const ANIM_AGENT_LAUGH_SHORT ("ca5b3f14-3194-7a2b-c894-aa699b718d1f"); +LLUUID const ANIM_AGENT_MEDIUM_LAND ("f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57"); +LLUUID const ANIM_AGENT_MOTORCYCLE_SIT ("08464f78-3a8e-2944-cba5-0c94aff3af29"); +LLUUID const ANIM_AGENT_MUSCLE_BEACH ("315c3a41-a5f3-0ba4-27da-f893f769e69b"); +LLUUID const ANIM_AGENT_NO ("5a977ed9-7f72-44e9-4c4c-6e913df8ae74"); +LLUUID const ANIM_AGENT_NO_UNHAPPY ("d83fa0e5-97ed-7eb2-e798-7bd006215cb4"); +LLUUID const ANIM_AGENT_NYAH_NYAH ("f061723d-0a18-754f-66ee-29a44795a32f"); +LLUUID const ANIM_AGENT_ONETWO_PUNCH ("eefc79be-daae-a239-8c04-890f5d23654a"); +LLUUID const ANIM_AGENT_PEACE ("b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9"); +LLUUID const ANIM_AGENT_POINT_ME ("17c024cc-eef2-f6a0-3527-9869876d7752"); +LLUUID const ANIM_AGENT_POINT_YOU ("ec952cca-61ef-aa3b-2789-4d1344f016de"); +LLUUID const ANIM_AGENT_PRE_JUMP ("7a4e87fe-de39-6fcb-6223-024b00893244"); +LLUUID const ANIM_AGENT_PUNCH_LEFT ("f3300ad9-3462-1d07-2044-0fef80062da0"); +LLUUID const ANIM_AGENT_PUNCH_RIGHT ("c8e42d32-7310-6906-c903-cab5d4a34656"); +LLUUID const ANIM_AGENT_REPULSED ("36f81a92-f076-5893-dc4b-7c3795e487cf"); +LLUUID const ANIM_AGENT_ROUNDHOUSE_KICK ("49aea43b-5ac3-8a44-b595-96100af0beda"); +LLUUID const ANIM_AGENT_RPS_COUNTDOWN ("35db4f7e-28c2-6679-cea9-3ee108f7fc7f"); +LLUUID const ANIM_AGENT_RPS_PAPER ("0836b67f-7f7b-f37b-c00a-460dc1521f5a"); +LLUUID const ANIM_AGENT_RPS_ROCK ("42dd95d5-0bc6-6392-f650-777304946c0f"); +LLUUID const ANIM_AGENT_RPS_SCISSORS ("16803a9f-5140-e042-4d7b-d28ba247c325"); +LLUUID const ANIM_AGENT_RUN ("05ddbff8-aaa9-92a1-2b74-8fe77a29b445"); +LLUUID const ANIM_AGENT_SAD ("0eb702e2-cc5a-9a88-56a5-661a55c0676a"); +LLUUID const ANIM_AGENT_SALUTE ("cd7668a6-7011-d7e2-ead8-fc69eff1a104"); +LLUUID const ANIM_AGENT_SHOOT_BOW_L ("e04d450d-fdb5-0432-fd68-818aaf5935f8"); +LLUUID const ANIM_AGENT_SHOUT ("6bd01860-4ebd-127a-bb3d-d1427e8e0c42"); +LLUUID const ANIM_AGENT_SHRUG ("70ea714f-3a97-d742-1b01-590a8fcd1db5"); +LLUUID const ANIM_AGENT_SIT ("1a5fe8ac-a804-8a5d-7cbd-56bd83184568"); +LLUUID const ANIM_AGENT_SIT_FEMALE ("b1709c8d-ecd3-54a1-4f28-d55ac0840782"); +LLUUID const ANIM_AGENT_SIT_GENERIC ("245f3c54-f1c0-bf2e-811f-46d8eeb386e7"); +LLUUID const ANIM_AGENT_SIT_GROUND ("1c7600d6-661f-b87b-efe2-d7421eb93c86"); +LLUUID const ANIM_AGENT_SIT_GROUND_CONSTRAINED("1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e"); +LLUUID const ANIM_AGENT_SIT_TO_STAND ("a8dee56f-2eae-9e7a-05a2-6fb92b97e21e"); +LLUUID const ANIM_AGENT_SLEEP ("f2bed5f9-9d44-39af-b0cd-257b2a17fe40"); +LLUUID const ANIM_AGENT_SMOKE_IDLE ("d2f2ee58-8ad1-06c9-d8d3-3827ba31567a"); +LLUUID const ANIM_AGENT_SMOKE_INHALE ("6802d553-49da-0778-9f85-1599a2266526"); +LLUUID const ANIM_AGENT_SMOKE_THROW_DOWN ("0a9fb970-8b44-9114-d3a9-bf69cfe804d6"); +LLUUID const ANIM_AGENT_SNAPSHOT ("eae8905b-271a-99e2-4c0e-31106afd100c"); +LLUUID const ANIM_AGENT_STAND ("2408fe9e-df1d-1d7d-f4ff-1384fa7b350f"); +LLUUID const ANIM_AGENT_STANDUP ("3da1d753-028a-5446-24f3-9c9b856d9422"); +LLUUID const ANIM_AGENT_STAND_1 ("15468e00-3400-bb66-cecc-646d7c14458e"); +LLUUID const ANIM_AGENT_STAND_2 ("370f3a20-6ca6-9971-848c-9a01bc42ae3c"); +LLUUID const ANIM_AGENT_STAND_3 ("42b46214-4b44-79ae-deb8-0df61424ff4b"); +LLUUID const ANIM_AGENT_STAND_4 ("f22fed8b-a5ed-2c93-64d5-bdd8b93c889f"); +LLUUID const ANIM_AGENT_STRETCH ("80700431-74ec-a008-14f8-77575e73693f"); +LLUUID const ANIM_AGENT_STRIDE ("1cb562b0-ba21-2202-efb3-30f82cdf9595"); +LLUUID const ANIM_AGENT_SURF ("41426836-7437-7e89-025d-0aa4d10f1d69"); +LLUUID const ANIM_AGENT_SURPRISE ("313b9881-4302-73c0-c7d0-0e7a36b6c224"); +LLUUID const ANIM_AGENT_SWORD_STRIKE ("85428680-6bf9-3e64-b489-6f81087c24bd"); +LLUUID const ANIM_AGENT_TALK ("5c682a95-6da4-a463-0bf6-0f5b7be129d1"); +LLUUID const ANIM_AGENT_TANTRUM ("11000694-3f41-adc2-606b-eee1d66f3724"); +LLUUID const ANIM_AGENT_THROW_R ("aa134404-7dac-7aca-2cba-435f9db875ca"); +LLUUID const ANIM_AGENT_TRYON_SHIRT ("83ff59fe-2346-f236-9009-4e3608af64c1"); +LLUUID const ANIM_AGENT_TURNLEFT ("56e0ba0d-4a9f-7f27-6117-32f2ebbf6135"); +LLUUID const ANIM_AGENT_TURNRIGHT ("2d6daa51-3192-6794-8e2e-a15f8338ec30"); +LLUUID const ANIM_AGENT_TYPE ("c541c47f-e0c0-058b-ad1a-d6ae3a4584d9"); +LLUUID const ANIM_AGENT_WALK ("6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0"); +LLUUID const ANIM_AGENT_WHISPER ("7693f268-06c7-ea71-fa21-2b30d6533f8f"); +LLUUID const ANIM_AGENT_WHISTLE ("b1ed7982-c68e-a982-7561-52a88a5298c0"); +LLUUID const ANIM_AGENT_WINK ("869ecdad-a44b-671e-3266-56aef2e3ac2e"); +LLUUID const ANIM_AGENT_WINK_HOLLYWOOD ("c0c4030f-c02b-49de-24ba-2331f43fe41c"); +LLUUID const ANIM_AGENT_WORRY ("9f496bd2-589a-709f-16cc-69bf7df1d36c"); +LLUUID const ANIM_AGENT_YES ("15dd911d-be82-2856-26db-27659b142875"); +LLUUID const ANIM_AGENT_YES_HAPPY ("b8c8b2a3-9008-1771-3bfc-90924955ab2d"); +LLUUID const ANIM_AGENT_YOGA_FLOAT ("42ecd00b-9947-a97c-400a-bbc9174c7aeb"); + LLUUID AGENT_WALK_ANIMS[] = {ANIM_AGENT_WALK, ANIM_AGENT_RUN, ANIM_AGENT_CROUCHWALK, ANIM_AGENT_TURNLEFT, ANIM_AGENT_TURNRIGHT}; S32 NUM_AGENT_WALK_ANIMS = LL_ARRAY_SIZE(AGENT_WALK_ANIMS); diff --git a/linden/indra/llcharacter/llanimationstates.h b/linden/indra/llcharacter/llanimationstates.h index 56b24d5..2218b6d 100644 --- a/linden/indra/llcharacter/llanimationstates.h +++ b/linden/indra/llcharacter/llanimationstates.h @@ -49,142 +49,141 @@ //----------------------------------------------------------------------------- const S32 MAX_CONCURRENT_ANIMS = 16; - -const LLUUID ANIM_AGENT_AFRAID = LLUUID("6b61c8e8-4747-0d75-12d7-e49ff207a4ca"); -const LLUUID ANIM_AGENT_AIM_BAZOOKA_R = LLUUID("b5b4a67d-0aee-30d2-72cd-77b333e932ef"); -const LLUUID ANIM_AGENT_AIM_BOW_L = LLUUID("46bb4359-de38-4ed8-6a22-f1f52fe8f506"); -const LLUUID ANIM_AGENT_AIM_HANDGUN_R = LLUUID("3147d815-6338-b932-f011-16b56d9ac18b"); -const LLUUID ANIM_AGENT_AIM_RIFLE_R = LLUUID("ea633413-8006-180a-c3ba-96dd1d756720"); -const LLUUID ANIM_AGENT_ANGRY = LLUUID("5747a48e-073e-c331-f6f3-7c2149613d3e"); -const LLUUID ANIM_AGENT_AWAY = LLUUID("fd037134-85d4-f241-72c6-4f42164fedee"); -const LLUUID ANIM_AGENT_BACKFLIP = LLUUID("c4ca6188-9127-4f31-0158-23c4e2f93304"); -const LLUUID ANIM_AGENT_BELLY_LAUGH = LLUUID("18b3a4b5-b463-bd48-e4b6-71eaac76c515"); -const LLUUID ANIM_AGENT_BLOW_KISS = LLUUID("db84829b-462c-ee83-1e27-9bbee66bd624"); -const LLUUID ANIM_AGENT_BORED = LLUUID("b906c4ba-703b-1940-32a3-0c7f7d791510"); -const LLUUID ANIM_AGENT_BOW = LLUUID("82e99230-c906-1403-4d9c-3889dd98daba"); -const LLUUID ANIM_AGENT_BRUSH = LLUUID("349a3801-54f9-bf2c-3bd0-1ac89772af01"); -const LLUUID ANIM_AGENT_BUSY = LLUUID("efcf670c-2d18-8128-973a-034ebc806b67"); -const LLUUID ANIM_AGENT_CLAP = LLUUID("9b0c1c4e-8ac7-7969-1494-28c874c4f668"); -const LLUUID ANIM_AGENT_COURTBOW = LLUUID("9ba1c942-08be-e43a-fb29-16ad440efc50"); -const LLUUID ANIM_AGENT_CROUCH = LLUUID("201f3fdf-cb1f-dbec-201f-7333e328ae7c"); -const LLUUID ANIM_AGENT_CROUCHWALK = LLUUID("47f5f6fb-22e5-ae44-f871-73aaaf4a6022"); -const LLUUID ANIM_AGENT_CRY = LLUUID("92624d3e-1068-f1aa-a5ec-8244585193ed"); -const LLUUID ANIM_AGENT_CUSTOMIZE = LLUUID("038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53"); -const LLUUID ANIM_AGENT_CUSTOMIZE_DONE = LLUUID("6883a61a-b27b-5914-a61e-dda118a9ee2c"); -const LLUUID ANIM_AGENT_DANCE1 = LLUUID("b68a3d7c-de9e-fc87-eec8-543d787e5b0d"); -const LLUUID ANIM_AGENT_DANCE2 = LLUUID("928cae18-e31d-76fd-9cc9-2f55160ff818"); -const LLUUID ANIM_AGENT_DANCE3 = LLUUID("30047778-10ea-1af7-6881-4db7a3a5a114"); -const LLUUID ANIM_AGENT_DANCE4 = LLUUID("951469f4-c7b2-c818-9dee-ad7eea8c30b7"); -const LLUUID ANIM_AGENT_DANCE5 = LLUUID("4bd69a1d-1114-a0b4-625f-84e0a5237155"); -const LLUUID ANIM_AGENT_DANCE6 = LLUUID("cd28b69b-9c95-bb78-3f94-8d605ff1bb12"); -const LLUUID ANIM_AGENT_DANCE7 = LLUUID("a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6"); -const LLUUID ANIM_AGENT_DANCE8 = LLUUID("b0dc417c-1f11-af36-2e80-7e7489fa7cdc"); -const LLUUID ANIM_AGENT_DEAD = LLUUID("57abaae6-1d17-7b1b-5f98-6d11a6411276"); -const LLUUID ANIM_AGENT_DRINK = LLUUID("0f86e355-dd31-a61c-fdb0-3a96b9aad05f"); -const LLUUID ANIM_AGENT_EMBARRASSED = LLUUID("514af488-9051-044a-b3fc-d4dbf76377c6"); -const LLUUID ANIM_AGENT_EXPRESS_AFRAID = LLUUID("aa2df84d-cf8f-7218-527b-424a52de766e"); -const LLUUID ANIM_AGENT_EXPRESS_ANGER = LLUUID("1a03b575-9634-b62a-5767-3a679e81f4de"); -const LLUUID ANIM_AGENT_EXPRESS_BORED = LLUUID("214aa6c1-ba6a-4578-f27c-ce7688f61d0d"); -const LLUUID ANIM_AGENT_EXPRESS_CRY = LLUUID("d535471b-85bf-3b4d-a542-93bea4f59d33"); -const LLUUID ANIM_AGENT_EXPRESS_DISDAIN = LLUUID("d4416ff1-09d3-300f-4183-1b68a19b9fc1"); -const LLUUID ANIM_AGENT_EXPRESS_EMBARRASSED = LLUUID("0b8c8211-d78c-33e8-fa28-c51a9594e424"); -const LLUUID ANIM_AGENT_EXPRESS_FROWN = LLUUID("fee3df48-fa3d-1015-1e26-a205810e3001"); -const LLUUID ANIM_AGENT_EXPRESS_KISS = LLUUID("1e8d90cc-a84e-e135-884c-7c82c8b03a14"); -const LLUUID ANIM_AGENT_EXPRESS_LAUGH = LLUUID("62570842-0950-96f8-341c-809e65110823"); -const LLUUID ANIM_AGENT_EXPRESS_OPEN_MOUTH = LLUUID("d63bc1f9-fc81-9625-a0c6-007176d82eb7"); -const LLUUID ANIM_AGENT_EXPRESS_REPULSED = LLUUID("f76cda94-41d4-a229-2872-e0296e58afe1"); -const LLUUID ANIM_AGENT_EXPRESS_SAD = LLUUID("eb6ebfb2-a4b3-a19c-d388-4dd5c03823f7"); -const LLUUID ANIM_AGENT_EXPRESS_SHRUG = LLUUID("a351b1bc-cc94-aac2-7bea-a7e6ebad15ef"); -const LLUUID ANIM_AGENT_EXPRESS_SMILE = LLUUID("b7c7c833-e3d3-c4e3-9fc0-131237446312"); -const LLUUID ANIM_AGENT_EXPRESS_SURPRISE = LLUUID("728646d9-cc79-08b2-32d6-937f0a835c24"); -const LLUUID ANIM_AGENT_EXPRESS_TONGUE_OUT = LLUUID("835965c6-7f2f-bda2-5deb-2478737f91bf"); -const LLUUID ANIM_AGENT_EXPRESS_TOOTHSMILE = LLUUID("b92ec1a5-e7ce-a76b-2b05-bcdb9311417e"); -const LLUUID ANIM_AGENT_EXPRESS_WINK = LLUUID("da020525-4d94-59d6-23d7-81fdebf33148"); -const LLUUID ANIM_AGENT_EXPRESS_WORRY = LLUUID("9c05e5c7-6f07-6ca4-ed5a-b230390c3950"); -const LLUUID ANIM_AGENT_FALLDOWN = LLUUID("666307d9-a860-572d-6fd4-c3ab8865c094"); -const LLUUID ANIM_AGENT_FEMALE_WALK = LLUUID("f5fc7433-043d-e819-8298-f519a119b688"); -const LLUUID ANIM_AGENT_FINGER_WAG = LLUUID("c1bc7f36-3ba0-d844-f93c-93be945d644f"); -const LLUUID ANIM_AGENT_FIST_PUMP = LLUUID("7db00ccd-f380-f3ee-439d-61968ec69c8a"); -const LLUUID ANIM_AGENT_FLY = LLUUID("aec4610c-757f-bc4e-c092-c6e9caf18daf"); -const LLUUID ANIM_AGENT_FLYSLOW = LLUUID("2b5a38b2-5e00-3a97-a495-4c826bc443e6"); -const LLUUID ANIM_AGENT_HELLO = LLUUID("9b29cd61-c45b-5689-ded2-91756b8d76a9"); -const LLUUID ANIM_AGENT_HOLD_BAZOOKA_R = LLUUID("ef62d355-c815-4816-2474-b1acc21094a6"); -const LLUUID ANIM_AGENT_HOLD_BOW_L = LLUUID("8b102617-bcba-037b-86c1-b76219f90c88"); -const LLUUID ANIM_AGENT_HOLD_HANDGUN_R = LLUUID("efdc1727-8b8a-c800-4077-975fc27ee2f2"); -const LLUUID ANIM_AGENT_HOLD_RIFLE_R = LLUUID("3d94bad0-c55b-7dcc-8763-033c59405d33"); -const LLUUID ANIM_AGENT_HOLD_THROW_R = LLUUID("7570c7b5-1f22-56dd-56ef-a9168241bbb6"); -const LLUUID ANIM_AGENT_HOVER = LLUUID("4ae8016b-31b9-03bb-c401-b1ea941db41d"); -const LLUUID ANIM_AGENT_HOVER_DOWN = LLUUID("20f063ea-8306-2562-0b07-5c853b37b31e"); -const LLUUID ANIM_AGENT_HOVER_UP = LLUUID("62c5de58-cb33-5743-3d07-9e4cd4352864"); -const LLUUID ANIM_AGENT_IMPATIENT = LLUUID("5ea3991f-c293-392e-6860-91dfa01278a3"); -const LLUUID ANIM_AGENT_JUMP = LLUUID("2305bd75-1ca9-b03b-1faa-b176b8a8c49e"); -const LLUUID ANIM_AGENT_JUMP_FOR_JOY = LLUUID("709ea28e-1573-c023-8bf8-520c8bc637fa"); -const LLUUID ANIM_AGENT_KISS_MY_BUTT = LLUUID("19999406-3a3a-d58c-a2ac-d72e555dcf51"); -const LLUUID ANIM_AGENT_LAND = LLUUID("7a17b059-12b2-41b1-570a-186368b6aa6f"); -const LLUUID ANIM_AGENT_LAUGH_SHORT = LLUUID("ca5b3f14-3194-7a2b-c894-aa699b718d1f"); -const LLUUID ANIM_AGENT_MEDIUM_LAND = LLUUID("f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57"); -const LLUUID ANIM_AGENT_MOTORCYCLE_SIT = LLUUID("08464f78-3a8e-2944-cba5-0c94aff3af29"); -const LLUUID ANIM_AGENT_MUSCLE_BEACH = LLUUID("315c3a41-a5f3-0ba4-27da-f893f769e69b"); -const LLUUID ANIM_AGENT_NO = LLUUID("5a977ed9-7f72-44e9-4c4c-6e913df8ae74"); -const LLUUID ANIM_AGENT_NO_UNHAPPY = LLUUID("d83fa0e5-97ed-7eb2-e798-7bd006215cb4"); -const LLUUID ANIM_AGENT_NYAH_NYAH = LLUUID("f061723d-0a18-754f-66ee-29a44795a32f"); -const LLUUID ANIM_AGENT_ONETWO_PUNCH = LLUUID("eefc79be-daae-a239-8c04-890f5d23654a"); -const LLUUID ANIM_AGENT_PEACE = LLUUID("b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9"); -const LLUUID ANIM_AGENT_POINT_ME = LLUUID("17c024cc-eef2-f6a0-3527-9869876d7752"); -const LLUUID ANIM_AGENT_POINT_YOU = LLUUID("ec952cca-61ef-aa3b-2789-4d1344f016de"); -const LLUUID ANIM_AGENT_PRE_JUMP = LLUUID("7a4e87fe-de39-6fcb-6223-024b00893244"); -const LLUUID ANIM_AGENT_PUNCH_LEFT = LLUUID("f3300ad9-3462-1d07-2044-0fef80062da0"); -const LLUUID ANIM_AGENT_PUNCH_RIGHT = LLUUID("c8e42d32-7310-6906-c903-cab5d4a34656"); -const LLUUID ANIM_AGENT_REPULSED = LLUUID("36f81a92-f076-5893-dc4b-7c3795e487cf"); -const LLUUID ANIM_AGENT_ROUNDHOUSE_KICK = LLUUID("49aea43b-5ac3-8a44-b595-96100af0beda"); -const LLUUID ANIM_AGENT_RPS_COUNTDOWN = LLUUID("35db4f7e-28c2-6679-cea9-3ee108f7fc7f"); -const LLUUID ANIM_AGENT_RPS_PAPER = LLUUID("0836b67f-7f7b-f37b-c00a-460dc1521f5a"); -const LLUUID ANIM_AGENT_RPS_ROCK = LLUUID("42dd95d5-0bc6-6392-f650-777304946c0f"); -const LLUUID ANIM_AGENT_RPS_SCISSORS = LLUUID("16803a9f-5140-e042-4d7b-d28ba247c325"); -const LLUUID ANIM_AGENT_RUN = LLUUID("05ddbff8-aaa9-92a1-2b74-8fe77a29b445"); -const LLUUID ANIM_AGENT_SAD = LLUUID("0eb702e2-cc5a-9a88-56a5-661a55c0676a"); -const LLUUID ANIM_AGENT_SALUTE = LLUUID("cd7668a6-7011-d7e2-ead8-fc69eff1a104"); -const LLUUID ANIM_AGENT_SHOOT_BOW_L = LLUUID("e04d450d-fdb5-0432-fd68-818aaf5935f8"); -const LLUUID ANIM_AGENT_SHOUT = LLUUID("6bd01860-4ebd-127a-bb3d-d1427e8e0c42"); -const LLUUID ANIM_AGENT_SHRUG = LLUUID("70ea714f-3a97-d742-1b01-590a8fcd1db5"); -const LLUUID ANIM_AGENT_SIT = LLUUID("1a5fe8ac-a804-8a5d-7cbd-56bd83184568"); -const LLUUID ANIM_AGENT_SIT_FEMALE = LLUUID("b1709c8d-ecd3-54a1-4f28-d55ac0840782"); -const LLUUID ANIM_AGENT_SIT_GENERIC = LLUUID("245f3c54-f1c0-bf2e-811f-46d8eeb386e7"); -const LLUUID ANIM_AGENT_SIT_GROUND = LLUUID("1c7600d6-661f-b87b-efe2-d7421eb93c86"); -const LLUUID ANIM_AGENT_SIT_GROUND_CONSTRAINED = LLUUID("1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e"); -const LLUUID ANIM_AGENT_SIT_TO_STAND = LLUUID("a8dee56f-2eae-9e7a-05a2-6fb92b97e21e"); -const LLUUID ANIM_AGENT_SLEEP = LLUUID("f2bed5f9-9d44-39af-b0cd-257b2a17fe40"); -const LLUUID ANIM_AGENT_SMOKE_IDLE = LLUUID("d2f2ee58-8ad1-06c9-d8d3-3827ba31567a"); -const LLUUID ANIM_AGENT_SMOKE_INHALE = LLUUID("6802d553-49da-0778-9f85-1599a2266526"); -const LLUUID ANIM_AGENT_SMOKE_THROW_DOWN = LLUUID("0a9fb970-8b44-9114-d3a9-bf69cfe804d6"); -const LLUUID ANIM_AGENT_SNAPSHOT = LLUUID("eae8905b-271a-99e2-4c0e-31106afd100c"); -const LLUUID ANIM_AGENT_STAND = LLUUID("2408fe9e-df1d-1d7d-f4ff-1384fa7b350f"); -const LLUUID ANIM_AGENT_STANDUP = LLUUID("3da1d753-028a-5446-24f3-9c9b856d9422"); -const LLUUID ANIM_AGENT_STAND_1 = LLUUID("15468e00-3400-bb66-cecc-646d7c14458e"); -const LLUUID ANIM_AGENT_STAND_2 = LLUUID("370f3a20-6ca6-9971-848c-9a01bc42ae3c"); -const LLUUID ANIM_AGENT_STAND_3 = LLUUID("42b46214-4b44-79ae-deb8-0df61424ff4b"); -const LLUUID ANIM_AGENT_STAND_4 = LLUUID("f22fed8b-a5ed-2c93-64d5-bdd8b93c889f"); -const LLUUID ANIM_AGENT_STRETCH = LLUUID("80700431-74ec-a008-14f8-77575e73693f"); -const LLUUID ANIM_AGENT_STRIDE = LLUUID("1cb562b0-ba21-2202-efb3-30f82cdf9595"); -const LLUUID ANIM_AGENT_SURF = LLUUID("41426836-7437-7e89-025d-0aa4d10f1d69"); -const LLUUID ANIM_AGENT_SURPRISE = LLUUID("313b9881-4302-73c0-c7d0-0e7a36b6c224"); -const LLUUID ANIM_AGENT_SWORD_STRIKE = LLUUID("85428680-6bf9-3e64-b489-6f81087c24bd"); -const LLUUID ANIM_AGENT_TALK = LLUUID("5c682a95-6da4-a463-0bf6-0f5b7be129d1"); -const LLUUID ANIM_AGENT_TANTRUM = LLUUID("11000694-3f41-adc2-606b-eee1d66f3724"); -const LLUUID ANIM_AGENT_THROW_R = LLUUID("aa134404-7dac-7aca-2cba-435f9db875ca"); -const LLUUID ANIM_AGENT_TRYON_SHIRT = LLUUID("83ff59fe-2346-f236-9009-4e3608af64c1"); -const LLUUID ANIM_AGENT_TURNLEFT = LLUUID("56e0ba0d-4a9f-7f27-6117-32f2ebbf6135"); -const LLUUID ANIM_AGENT_TURNRIGHT = LLUUID("2d6daa51-3192-6794-8e2e-a15f8338ec30"); -const LLUUID ANIM_AGENT_TYPE = LLUUID("c541c47f-e0c0-058b-ad1a-d6ae3a4584d9"); -const LLUUID ANIM_AGENT_WALK = LLUUID("6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0"); -const LLUUID ANIM_AGENT_WHISPER = LLUUID("7693f268-06c7-ea71-fa21-2b30d6533f8f"); -const LLUUID ANIM_AGENT_WHISTLE = LLUUID("b1ed7982-c68e-a982-7561-52a88a5298c0"); -const LLUUID ANIM_AGENT_WINK = LLUUID("869ecdad-a44b-671e-3266-56aef2e3ac2e"); -const LLUUID ANIM_AGENT_WINK_HOLLYWOOD = LLUUID("c0c4030f-c02b-49de-24ba-2331f43fe41c"); -const LLUUID ANIM_AGENT_WORRY = LLUUID("9f496bd2-589a-709f-16cc-69bf7df1d36c"); -const LLUUID ANIM_AGENT_YES = LLUUID("15dd911d-be82-2856-26db-27659b142875"); -const LLUUID ANIM_AGENT_YES_HAPPY = LLUUID("b8c8b2a3-9008-1771-3bfc-90924955ab2d"); -const LLUUID ANIM_AGENT_YOGA_FLOAT = LLUUID("42ecd00b-9947-a97c-400a-bbc9174c7aeb"); +extern LLUUID const ANIM_AGENT_AFRAID; +extern LLUUID const ANIM_AGENT_AIM_BAZOOKA_R; +extern LLUUID const ANIM_AGENT_AIM_BOW_L; +extern LLUUID const ANIM_AGENT_AIM_HANDGUN_R; +extern LLUUID const ANIM_AGENT_AIM_RIFLE_R; +extern LLUUID const ANIM_AGENT_ANGRY; +extern LLUUID const ANIM_AGENT_AWAY; +extern LLUUID const ANIM_AGENT_BACKFLIP; +extern LLUUID const ANIM_AGENT_BELLY_LAUGH; +extern LLUUID const ANIM_AGENT_BLOW_KISS; +extern LLUUID const ANIM_AGENT_BORED; +extern LLUUID const ANIM_AGENT_BOW; +extern LLUUID const ANIM_AGENT_BRUSH; +extern LLUUID const ANIM_AGENT_BUSY; +extern LLUUID const ANIM_AGENT_CLAP; +extern LLUUID const ANIM_AGENT_COURTBOW; +extern LLUUID const ANIM_AGENT_CROUCH; +extern LLUUID const ANIM_AGENT_CROUCHWALK; +extern LLUUID const ANIM_AGENT_CRY; +extern LLUUID const ANIM_AGENT_CUSTOMIZE; +extern LLUUID const ANIM_AGENT_CUSTOMIZE_DONE; +extern LLUUID const ANIM_AGENT_DANCE1; +extern LLUUID const ANIM_AGENT_DANCE2; +extern LLUUID const ANIM_AGENT_DANCE3; +extern LLUUID const ANIM_AGENT_DANCE4; +extern LLUUID const ANIM_AGENT_DANCE5; +extern LLUUID const ANIM_AGENT_DANCE6; +extern LLUUID const ANIM_AGENT_DANCE7; +extern LLUUID const ANIM_AGENT_DANCE8; +extern LLUUID const ANIM_AGENT_DEAD; +extern LLUUID const ANIM_AGENT_DRINK; +extern LLUUID const ANIM_AGENT_EMBARRASSED; +extern LLUUID const ANIM_AGENT_EXPRESS_AFRAID; +extern LLUUID const ANIM_AGENT_EXPRESS_ANGER; +extern LLUUID const ANIM_AGENT_EXPRESS_BORED; +extern LLUUID const ANIM_AGENT_EXPRESS_CRY; +extern LLUUID const ANIM_AGENT_EXPRESS_DISDAIN; +extern LLUUID const ANIM_AGENT_EXPRESS_EMBARRASSED; +extern LLUUID const ANIM_AGENT_EXPRESS_FROWN; +extern LLUUID const ANIM_AGENT_EXPRESS_KISS; +extern LLUUID const ANIM_AGENT_EXPRESS_LAUGH; +extern LLUUID const ANIM_AGENT_EXPRESS_OPEN_MOUTH; +extern LLUUID const ANIM_AGENT_EXPRESS_REPULSED; +extern LLUUID const ANIM_AGENT_EXPRESS_SAD; +extern LLUUID const ANIM_AGENT_EXPRESS_SHRUG; +extern LLUUID const ANIM_AGENT_EXPRESS_SMILE; +extern LLUUID const ANIM_AGENT_EXPRESS_SURPRISE; +extern LLUUID const ANIM_AGENT_EXPRESS_TONGUE_OUT; +extern LLUUID const ANIM_AGENT_EXPRESS_TOOTHSMILE; +extern LLUUID const ANIM_AGENT_EXPRESS_WINK; +extern LLUUID const ANIM_AGENT_EXPRESS_WORRY; +extern LLUUID const ANIM_AGENT_FALLDOWN; +extern LLUUID const ANIM_AGENT_FEMALE_WALK; +extern LLUUID const ANIM_AGENT_FINGER_WAG; +extern LLUUID const ANIM_AGENT_FIST_PUMP; +extern LLUUID const ANIM_AGENT_FLY; +extern LLUUID const ANIM_AGENT_FLYSLOW; +extern LLUUID const ANIM_AGENT_HELLO; +extern LLUUID const ANIM_AGENT_HOLD_BAZOOKA_R; +extern LLUUID const ANIM_AGENT_HOLD_BOW_L; +extern LLUUID const ANIM_AGENT_HOLD_HANDGUN_R; +extern LLUUID const ANIM_AGENT_HOLD_RIFLE_R; +extern LLUUID const ANIM_AGENT_HOLD_THROW_R; +extern LLUUID const ANIM_AGENT_HOVER; +extern LLUUID const ANIM_AGENT_HOVER_DOWN; +extern LLUUID const ANIM_AGENT_HOVER_UP; +extern LLUUID const ANIM_AGENT_IMPATIENT; +extern LLUUID const ANIM_AGENT_JUMP; +extern LLUUID const ANIM_AGENT_JUMP_FOR_JOY; +extern LLUUID const ANIM_AGENT_KISS_MY_BUTT; +extern LLUUID const ANIM_AGENT_LAND; +extern LLUUID const ANIM_AGENT_LAUGH_SHORT; +extern LLUUID const ANIM_AGENT_MEDIUM_LAND; +extern LLUUID const ANIM_AGENT_MOTORCYCLE_SIT; +extern LLUUID const ANIM_AGENT_MUSCLE_BEACH; +extern LLUUID const ANIM_AGENT_NO; +extern LLUUID const ANIM_AGENT_NO_UNHAPPY; +extern LLUUID const ANIM_AGENT_NYAH_NYAH; +extern LLUUID const ANIM_AGENT_ONETWO_PUNCH; +extern LLUUID const ANIM_AGENT_PEACE; +extern LLUUID const ANIM_AGENT_POINT_ME; +extern LLUUID const ANIM_AGENT_POINT_YOU; +extern LLUUID const ANIM_AGENT_PRE_JUMP; +extern LLUUID const ANIM_AGENT_PUNCH_LEFT; +extern LLUUID const ANIM_AGENT_PUNCH_RIGHT; +extern LLUUID const ANIM_AGENT_REPULSED; +extern LLUUID const ANIM_AGENT_ROUNDHOUSE_KICK; +extern LLUUID const ANIM_AGENT_RPS_COUNTDOWN; +extern LLUUID const ANIM_AGENT_RPS_PAPER; +extern LLUUID const ANIM_AGENT_RPS_ROCK; +extern LLUUID const ANIM_AGENT_RPS_SCISSORS; +extern LLUUID const ANIM_AGENT_RUN; +extern LLUUID const ANIM_AGENT_SAD; +extern LLUUID const ANIM_AGENT_SALUTE; +extern LLUUID const ANIM_AGENT_SHOOT_BOW_L; +extern LLUUID const ANIM_AGENT_SHOUT; +extern LLUUID const ANIM_AGENT_SHRUG; +extern LLUUID const ANIM_AGENT_SIT; +extern LLUUID const ANIM_AGENT_SIT_FEMALE; +extern LLUUID const ANIM_AGENT_SIT_GENERIC; +extern LLUUID const ANIM_AGENT_SIT_GROUND; +extern LLUUID const ANIM_AGENT_SIT_GROUND_CONSTRAINED; +extern LLUUID const ANIM_AGENT_SIT_TO_STAND; +extern LLUUID const ANIM_AGENT_SLEEP; +extern LLUUID const ANIM_AGENT_SMOKE_IDLE; +extern LLUUID const ANIM_AGENT_SMOKE_INHALE; +extern LLUUID const ANIM_AGENT_SMOKE_THROW_DOWN; +extern LLUUID const ANIM_AGENT_SNAPSHOT; +extern LLUUID const ANIM_AGENT_STAND; +extern LLUUID const ANIM_AGENT_STANDUP; +extern LLUUID const ANIM_AGENT_STAND_1; +extern LLUUID const ANIM_AGENT_STAND_2; +extern LLUUID const ANIM_AGENT_STAND_3; +extern LLUUID const ANIM_AGENT_STAND_4; +extern LLUUID const ANIM_AGENT_STRETCH; +extern LLUUID const ANIM_AGENT_STRIDE; +extern LLUUID const ANIM_AGENT_SURF; +extern LLUUID const ANIM_AGENT_SURPRISE; +extern LLUUID const ANIM_AGENT_SWORD_STRIKE; +extern LLUUID const ANIM_AGENT_TALK; +extern LLUUID const ANIM_AGENT_TANTRUM; +extern LLUUID const ANIM_AGENT_THROW_R; +extern LLUUID const ANIM_AGENT_TRYON_SHIRT; +extern LLUUID const ANIM_AGENT_TURNLEFT; +extern LLUUID const ANIM_AGENT_TURNRIGHT; +extern LLUUID const ANIM_AGENT_TYPE; +extern LLUUID const ANIM_AGENT_WALK; +extern LLUUID const ANIM_AGENT_WHISPER; +extern LLUUID const ANIM_AGENT_WHISTLE; +extern LLUUID const ANIM_AGENT_WINK; +extern LLUUID const ANIM_AGENT_WINK_HOLLYWOOD; +extern LLUUID const ANIM_AGENT_WORRY; +extern LLUUID const ANIM_AGENT_YES; +extern LLUUID const ANIM_AGENT_YES_HAPPY; +extern LLUUID const ANIM_AGENT_YOGA_FLOAT; extern LLUUID AGENT_WALK_ANIMS[]; extern S32 NUM_AGENT_WALK_ANIMS; diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt index 3f14be6..beacce3 100644 --- a/linden/indra/llcommon/CMakeLists.txt +++ b/linden/indra/llcommon/CMakeLists.txt @@ -12,6 +12,8 @@ include_directories( ) set(llcommon_SOURCE_FILES + imageids.cpp + indra_constants.cpp llapp.cpp llapr.cpp llassettype.cpp diff --git a/linden/indra/llcommon/imageids.cpp b/linden/indra/llcommon/imageids.cpp new file mode 100644 index 0000000..6b4fcd3 --- /dev/null +++ b/linden/indra/llcommon/imageids.cpp @@ -0,0 +1,77 @@ +/** + * @file imageids.cpp + * + * $LicenseInfo:firstyear=2001&license=viewergpl$ + * + * Copyright (c) 2001-2010, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlife.com/developers/opensource/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlife.com/developers/opensource/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + * + */ + +#include "linden_common.h" + +#include "imageids.h" + +#include "lluuid.h" + +// +// USE OF THIS FILE IS DEPRECATED +// +// Please use viewerart.ini and the standard +// art import path. // indicates if file is only + // on dataserver, or also + // pre-cached on viewer + +// Grass Images +const LLUUID IMG_SMOKE ("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d"); // VIEWER + +const LLUUID IMG_DEFAULT ("d2114404-dd59-4a4d-8e6c-49359e91bbf0"); // VIEWER + +const LLUUID IMG_SUN ("cce0f112-878f-4586-a2e2-a8f104bba271"); // dataserver +const LLUUID IMG_MOON ("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver +const LLUUID IMG_CLOUD_POOF ("fc4b9f0b-d008-45c6-96a4-01dd947ac621"); // dataserver +const LLUUID IMG_SHOT ("35f217a3-f618-49cf-bbca-c86d486551a9"); // dataserver +const LLUUID IMG_SPARK ("d2e75ac1-d0fb-4532-820e-a20034ac814d"); // dataserver +const LLUUID IMG_FIRE ("aca40aa8-44cf-44ca-a0fa-93e1a2986f82"); // dataserver +const LLUUID IMG_FACE_SELECT ("a85ac674-cb75-4af6-9499-df7c5aaf7a28"); // face selector +const LLUUID IMG_DEFAULT_AVATAR ("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); // dataserver +const LLUUID IMG_INVISIBLE ("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); // dataserver + +const LLUUID IMG_EXPLOSION ("68edcf47-ccd7-45b8-9f90-1649d7f12806"); // On dataserver +const LLUUID IMG_EXPLOSION_2 ("21ce046c-83fe-430a-b629-c7660ac78d7c"); // On dataserver +const LLUUID IMG_EXPLOSION_3 ("fedea30a-1be8-47a6-bc06-337a04a39c4b"); // On dataserver +const LLUUID IMG_EXPLOSION_4 ("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); // On dataserver +const LLUUID IMG_SMOKE_POOF ("1e63e323-5fe0-452e-92f8-b98bd0f764e3"); // On dataserver + +const LLUUID IMG_BIG_EXPLOSION_1 ("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); // On dataserver +const LLUUID IMG_BIG_EXPLOSION_2 ("9c8eca51-53d5-42a7-bb58-cef070395db8"); // On dataserver + +const LLUUID IMG_BLOOM1 ("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"); // VIEWER +const LLUUID TERRAIN_DIRT_DETAIL ("0bc58228-74a0-7e83-89bc-5c23464bcec5"); // VIEWER +const LLUUID TERRAIN_GRASS_DETAIL ("63338ede-0037-c4fd-855b-015d77112fc8"); // VIEWER +const LLUUID TERRAIN_MOUNTAIN_DETAIL ("303cd381-8560-7579-23f1-f0a880799740"); // VIEWER +const LLUUID TERRAIN_ROCK_DETAIL ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER + +const LLUUID DEFAULT_WATER_NORMAL ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h index beba0e2..7bae496 100644 --- a/linden/indra/llcommon/imageids.h +++ b/linden/indra/llcommon/imageids.h @@ -33,46 +33,43 @@ #ifndef LL_IMAGEIDS_H #define LL_IMAGEIDS_H -#include "lluuid.h" - // // USE OF THIS FILE IS DEPRECATED // // Please use viewerart.ini and the standard -// art import path. // indicates if file is only - // on dataserver, or also - // pre-cached on viewer +// art import path. + +class LLUUID; -// Grass Images -const LLUUID IMG_SMOKE ("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d"); // VIEWER +extern const LLUUID IMG_SMOKE; -const LLUUID IMG_DEFAULT ("d2114404-dd59-4a4d-8e6c-49359e91bbf0"); // VIEWER +extern const LLUUID IMG_DEFAULT; -const LLUUID IMG_SUN ("cce0f112-878f-4586-a2e2-a8f104bba271"); // dataserver -const LLUUID IMG_MOON ("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver -const LLUUID IMG_CLOUD_POOF ("fc4b9f0b-d008-45c6-96a4-01dd947ac621"); // dataserver -const LLUUID IMG_SHOT ("35f217a3-f618-49cf-bbca-c86d486551a9"); // dataserver - legacy? -const LLUUID IMG_SPARK ("d2e75ac1-d0fb-4532-820e-a20034ac814d"); // dataserver - unused -const LLUUID IMG_FIRE ("aca40aa8-44cf-44ca-a0fa-93e1a2986f82"); // dataserver - unused -const LLUUID IMG_FACE_SELECT ("a85ac674-cb75-4af6-9499-df7c5aaf7a28"); // face selector -const LLUUID IMG_DEFAULT_AVATAR ("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); // dataserver -const LLUUID IMG_INVISIBLE ("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); // dataserver +extern const LLUUID IMG_SUN; +extern const LLUUID IMG_MOON; +extern const LLUUID IMG_CLOUD_POOF; +extern const LLUUID IMG_SHOT; +extern const LLUUID IMG_SPARK; +extern const LLUUID IMG_FIRE; +extern const LLUUID IMG_FACE_SELECT; +extern const LLUUID IMG_DEFAULT_AVATAR; +extern const LLUUID IMG_INVISIBLE; -const LLUUID IMG_EXPLOSION ("68edcf47-ccd7-45b8-9f90-1649d7f12806"); // On dataserver - unused -const LLUUID IMG_EXPLOSION_2 ("21ce046c-83fe-430a-b629-c7660ac78d7c"); // On dataserver - unused -const LLUUID IMG_EXPLOSION_3 ("fedea30a-1be8-47a6-bc06-337a04a39c4b"); // On dataserver - unused -const LLUUID IMG_EXPLOSION_4 ("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); // On dataserver - unused -const LLUUID IMG_SMOKE_POOF ("1e63e323-5fe0-452e-92f8-b98bd0f764e3"); // On dataserver - legacy? +extern const LLUUID IMG_EXPLOSION; +extern const LLUUID IMG_EXPLOSION_2; +extern const LLUUID IMG_EXPLOSION_3; +extern const LLUUID IMG_EXPLOSION_4; +extern const LLUUID IMG_SMOKE_POOF; -const LLUUID IMG_BIG_EXPLOSION_1 ("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); // On dataserver - unused -const LLUUID IMG_BIG_EXPLOSION_2 ("9c8eca51-53d5-42a7-bb58-cef070395db8"); // On dataserver - unused +extern const LLUUID IMG_BIG_EXPLOSION_1; +extern const LLUUID IMG_BIG_EXPLOSION_2; -const LLUUID IMG_BLOOM1 ("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"); // VIEWER -const LLUUID TERRAIN_DIRT_DETAIL ("0bc58228-74a0-7e83-89bc-5c23464bcec5"); // VIEWER -const LLUUID TERRAIN_GRASS_DETAIL ("63338ede-0037-c4fd-855b-015d77112fc8"); // VIEWER -const LLUUID TERRAIN_MOUNTAIN_DETAIL ("303cd381-8560-7579-23f1-f0a880799740"); // VIEWER -const LLUUID TERRAIN_ROCK_DETAIL ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER +extern const LLUUID IMG_BLOOM1; +extern const LLUUID TERRAIN_DIRT_DETAIL; +extern const LLUUID TERRAIN_GRASS_DETAIL; +extern const LLUUID TERRAIN_MOUNTAIN_DETAIL; +extern const LLUUID TERRAIN_ROCK_DETAIL; -const LLUUID DEFAULT_WATER_NORMAL ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER +extern const LLUUID DEFAULT_WATER_NORMAL; #endif diff --git a/linden/indra/llcommon/indra_constants.cpp b/linden/indra/llcommon/indra_constants.cpp new file mode 100644 index 0000000..64cbb11 --- /dev/null +++ b/linden/indra/llcommon/indra_constants.cpp @@ -0,0 +1,47 @@ +/** + * @file indra_constants.cpp + * @brief some useful short term constants for Indra + * + * $LicenseInfo:firstyear=2001&license=viewergpl$ + * + * Copyright (c) 2001-2010, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlife.com/developers/opensource/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlife.com/developers/opensource/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#include "linden_common.h" + +#include "indra_constants.h" + +#include "lluuid.h" + +// "agent id" for things that should be done to ALL agents +const LLUUID LL_UUID_ALL_AGENTS("44e87126-e794-4ded-05b3-7c42da3d5cdb"); + +// Governor Linden's agent id. +const LLUUID ALEXANDRIA_LINDEN_ID("ba2a564a-f0f1-4b82-9c61-b7520bfcd09f"); +const LLUUID GOVERNOR_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1"); +const LLUUID REALESTATE_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1"); +// Maintenance's group id. +const LLUUID MAINTENANCE_GROUP_ID("dc7b21cd-3c89-fcaa-31c8-25f9ffd224cd"); diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h index 96c0a1f..34d1538 100644 --- a/linden/indra/llcommon/indra_constants.h +++ b/linden/indra/llcommon/indra_constants.h @@ -34,7 +34,9 @@ #define LL_INDRA_CONSTANTS_H #include "stdtypes.h" -#include "lluuid.h" +#include "llpreprocessor.h" + +class LLUUID; // At 45 Hz collisions seem stable and objects seem // to settle down at a reasonable rate. @@ -261,14 +263,15 @@ const U8 GOD_LIKE = 1; const U8 GOD_NOT = 0; // "agent id" for things that should be done to ALL agents -const LLUUID LL_UUID_ALL_AGENTS("44e87126-e794-4ded-05b3-7c42da3d5cdb"); +extern const LLUUID LL_UUID_ALL_AGENTS; + +// inventory library owner +extern const LLUUID ALEXANDRIA_LINDEN_ID; -// Governor Linden's agent id. -const LLUUID ALEXANDRIA_LINDEN_ID("ba2a564a-f0f1-4b82-9c61-b7520bfcd09f"); -const LLUUID GOVERNOR_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1"); -const LLUUID REALESTATE_LINDEN_ID("3d6181b0-6a4b-97ef-18d8-722652995cf1"); +extern const LLUUID GOVERNOR_LINDEN_ID; +extern const LLUUID REALESTATE_LINDEN_ID; // Maintenance's group id. -const LLUUID MAINTENANCE_GROUP_ID("dc7b21cd-3c89-fcaa-31c8-25f9ffd224cd"); +extern const LLUUID MAINTENANCE_GROUP_ID; // Flags for kick message const U32 KICK_FLAGS_DEFAULT = 0x0; diff --git a/linden/indra/llcommon/lldate.cpp b/linden/indra/llcommon/lldate.cpp index 41a3af3..be29448 100644 --- a/linden/indra/llcommon/lldate.cpp +++ b/linden/indra/llcommon/lldate.cpp @@ -113,6 +113,8 @@ void LLDate::toHTTPDateStream(std::ostream& s) const #else s.setf(ios::right); #endif + static char const* const weekdays[] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}; + static char const* const months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; std::string day = weekdays[exp_time.tm_wday]; std::string month = months[exp_time.tm_mon]; diff --git a/linden/indra/llcommon/lldate.h b/linden/indra/llcommon/lldate.h index 7cc9c8a..5e1a491 100644 --- a/linden/indra/llcommon/lldate.h +++ b/linden/indra/llcommon/lldate.h @@ -158,9 +158,4 @@ std::ostream& operator<<(std::ostream& s, const LLDate& date); // Helper function to stream in a date std::istream& operator>>(std::istream& s, LLDate& date); - -const static std::string weekdays[] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}; - -const static std::string months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - #endif // LL_LLDATE_H diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h index fc5363f..a24c0a8 100644 --- a/linden/indra/llcommon/lllslconstants.h +++ b/linden/indra/llcommon/lllslconstants.h @@ -189,9 +189,6 @@ const S32 OBJECT_OWNER = 6; const S32 OBJECT_GROUP = 7; const S32 OBJECT_CREATOR = 8; -// llTextBox() magic token string - yes this is a hack. sue me. -const std::string TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!"; - // changed() event flags const U32 CHANGED_NONE = 0x0; const U32 CHANGED_INVENTORY = 0x1; diff --git a/linden/indra/llmath/llcamera.cpp b/linden/indra/llmath/llcamera.cpp index 0f343bc..e6b6797 100644 --- a/linden/indra/llmath/llcamera.cpp +++ b/linden/indra/llmath/llcamera.cpp @@ -684,6 +684,7 @@ void LLCamera::calculateFrustumPlanes(F32 left, F32 right, F32 top, F32 bottom) mLocalPlanes[PLANE_BOTTOM].setVec( a, c, b); //calculate center and radius squared of frustum in world absolute coordinates + static LLVector3 const X_AXIS(1.f, 0.f, 0.f); mFrustCenter = X_AXIS*mFarPlane*0.5f; mFrustCenter = transformToAbsolute(mFrustCenter); mFrustRadiusSquared = mFarPlane*0.5f; diff --git a/linden/indra/llmath/llcamera.h b/linden/indra/llmath/llcamera.h index 23ee115..85b93df 100644 --- a/linden/indra/llmath/llcamera.h +++ b/linden/indra/llmath/llcamera.h @@ -56,15 +56,6 @@ const F32 MIN_FAR_PLANE = 0.2f; static const F32 MIN_FIELD_OF_VIEW = 5.0f * DEG_TO_RAD; static const F32 MAX_FIELD_OF_VIEW = 175.f * DEG_TO_RAD; -static const LLVector3 X_AXIS(1.f,0.f,0.f); -static const LLVector3 Y_AXIS(0.f,1.f,0.f); -static const LLVector3 Z_AXIS(0.f,0.f,1.f); - -static const LLVector3 NEG_X_AXIS(-1.f,0.f,0.f); -static const LLVector3 NEG_Y_AXIS(0.f,-1.f,0.f); -static const LLVector3 NEG_Z_AXIS(0.f,0.f,-1.f); - - // An LLCamera is an LLCoorFrame with a view frustum. // This means that it has several methods for moving it around // that are inherited from the LLCoordFrame() class : diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt index 0f3e159..a484580 100644 --- a/linden/indra/llmessage/CMakeLists.txt +++ b/linden/indra/llmessage/CMakeLists.txt @@ -96,6 +96,7 @@ set(llmessage_SOURCE_FILES patch_code.cpp patch_dct.cpp patch_idct.cpp + sound_ids.cpp ) set(llmessage_HEADER_FILES diff --git a/linden/indra/llmessage/sound_ids.cpp b/linden/indra/llmessage/sound_ids.cpp new file mode 100644 index 0000000..b31fba5 --- /dev/null +++ b/linden/indra/llmessage/sound_ids.cpp @@ -0,0 +1,290 @@ +/** + * @file sound_ids.cpp + * @brief Temporary holder for sound IDs. + * + * $LicenseInfo:firstyear=2001&license=viewergpl$ + * + * Copyright (c) 2001-2009, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ + */ + +#include "sound_ids.h" + +LLUUID const SND_NULL = LLUUID::null; +LLUUID const SND_RIDE ("00000000-0000-0000-0000-000000000100"); +LLUUID const SND_SHOT ("00000000-0000-0000-0000-000000000101"); +LLUUID const SND_MORTAR ("00000000-0000-0000-0000-000000000102"); +LLUUID const SND_HIT ("00000000-0000-0000-0000-000000000103"); +LLUUID const SND_EXPLOSION ("00000000-0000-0000-0000-000000000104"); +LLUUID const SND_BOING ("00000000-0000-0000-0000-000000000105"); +LLUUID const SND_OBJECT_CREATE ("9f1bc096-3592-411e-9b0b-c447a9ff054c"); + +// +// Different bird sounds for different states +// + +LLUUID const SND_CHIRP ("00000000-0000-0000-0000-000000000106"); // Flying random chirp +LLUUID const SND_CHIRP2 ("828a9526-175b-455d-8af0-0e3c0fb602b2"); // Spooked by user +LLUUID const SND_CHIRP3 ("f99772d6-1ce6-4a39-a28b-06d26c94c9e3"); // Spooked by object +LLUUID const SND_CHIRP4 ("54472ca4-7fc9-42cb-b7d5-99ad5b12bd50"); // Chasing other bird +LLUUID const SND_CHIRP5 ("2929964f-fac5-40d7-9179-2864a8fa9ace"); // Hopping random chirp +LLUUID const SND_CHIRPDEAD ("9abff1d3-863a-4e04-bd83-3834fd7fcff4"); // Hit by grenade - dead! + + +LLUUID const SND_MUNCH ("00000000-0000-0000-0000-000000000107"); +LLUUID const SND_PUNCH ("00000000-0000-0000-0000-000000000108"); +LLUUID const SND_SPLASH ("00000000-0000-0000-0000-000000000109"); +LLUUID const SND_CLICK ("00000000-0000-0000-0000-000000000110"); +LLUUID const SND_WHISTLE ("ab858f9a-1f44-4d39-9b33-351543d03ccb"); +LLUUID const SND_TYPING ("5e191c7b-8996-9ced-a177-b2ac32bfea06"); + +LLUUID const SND_ARROW_SHOT ("00000000-0000-0000-0000-000000000111"); +LLUUID const SND_ARROW_THUD ("00000000-0000-0000-0000-000000000112"); +LLUUID const SND_LASER_SHOT ("00000000-0000-0000-0000-000000000113"); +LLUUID const SND_JET_THRUST ("67f5e4f0-0534-4d97-bc01-f297648d20e0"); + +LLUUID const SND_SILENCE ("00000000-0000-0000-0000-000000000114"); +LLUUID const SND_BUBBLES ("00000000-0000-0000-0000-000000000115"); +LLUUID const SND_WELCOME ("00000000-0000-0000-0000-000000000116"); +LLUUID const SND_SQUISH ("00000000-0000-0000-0000-000000000117"); +LLUUID const SND_SUBPOD ("00000000-0000-0000-0000-000000000118"); +LLUUID const SND_FOOTSTEPS ("00000000-0000-0000-0000-000000000119"); +LLUUID const SND_STEP_LEFT ("00000000-0000-0000-0000-000000000124"); +LLUUID const SND_STEP_RIGHT ("00000000-0000-0000-0000-000000000125"); + +LLUUID const SND_BALL_COLLISION ("00000000-0000-0000-0000-000000000120"); + +LLUUID const SND_OOOH_SCARE_ME ("00000000-0000-0000-0000-000000000121"); +LLUUID const SND_PAYBACK_TIME ("00000000-0000-0000-0000-000000000122"); +LLUUID const SND_READY_FOR_BATTLE ("00000000-0000-0000-0000-000000000123"); + +LLUUID const SND_FLESH_FLESH ("dce5fdd4-afe4-4ea1-822f-dd52cac46b08"); +LLUUID const SND_FLESH_PLASTIC ("51011582-fbca-4580-ae9e-1a5593f094ec"); +LLUUID const SND_FLESH_RUBBER ("68d62208-e257-4d0c-bbe2-20c9ea9760bb"); +LLUUID const SND_GLASS_FLESH ("75872e8c-bc39-451b-9b0b-042d7ba36cba"); +LLUUID const SND_GLASS_GLASS ("6a45ba0b-5775-4ea8-8513-26008a17f873"); +LLUUID const SND_GLASS_PLASTIC ("992a6d1b-8c77-40e0-9495-4098ce539694"); +LLUUID const SND_GLASS_RUBBER ("2de4da5a-faf8-46be-bac6-c4d74f1e5767"); +LLUUID const SND_GLASS_WOOD ("6e3fb0f7-6d9c-42ca-b86b-1122ff562d7d"); +LLUUID const SND_METAL_FLESH ("14209133-4961-4acc-9649-53fc38ee1667"); +LLUUID const SND_METAL_GLASS ("bc4a4348-cfcc-4e5e-908e-8a52a8915fe6"); +LLUUID const SND_METAL_METAL ("9e5c1297-6eed-40c0-825a-d9bcd86e3193"); +LLUUID const SND_METAL_PLASTIC ("e534761c-1894-4b61-b20c-658a6fb68157"); +LLUUID const SND_METAL_RUBBER ("8761f73f-6cf9-4186-8aaa-0948ed002db1"); +LLUUID const SND_METAL_WOOD ("874a26fd-142f-4173-8c5b-890cd846c74d"); +LLUUID const SND_PLASTIC_PLASTIC ("0e24a717-b97e-4b77-9c94-b59a5a88b2da"); +LLUUID const SND_RUBBER_PLASTIC ("75cf3ade-9a5b-4c4d-bb35-f9799bda7fb2"); +LLUUID const SND_RUBBER_RUBBER ("153c8bf7-fb89-4d89-b263-47e58b1b4774"); +LLUUID const SND_STONE_FLESH ("55c3e0ce-275a-46fa-82ff-e0465f5e8703"); +LLUUID const SND_STONE_GLASS ("24babf58-7156-4841-9a3f-761bdbb8e237"); +LLUUID const SND_STONE_METAL ("aca261d8-e145-4610-9e20-9eff990f2c12"); +LLUUID const SND_STONE_PLASTIC ("0642fba6-5dcf-4d62-8e7b-94dbb529d117"); +LLUUID const SND_STONE_RUBBER ("25a863e8-dc42-4e8a-a357-e76422ace9b5"); +LLUUID const SND_STONE_STONE ("9538f37c-456e-4047-81be-6435045608d4"); +LLUUID const SND_STONE_WOOD ("8c0f84c3-9afd-4396-b5f5-9bca2c911c20"); +LLUUID const SND_WOOD_FLESH ("be582e5d-b123-41a2-a150-454c39e961c8"); +LLUUID const SND_WOOD_PLASTIC ("c70141d4-ba06-41ea-bcbc-35ea81cb8335"); +LLUUID const SND_WOOD_RUBBER ("7d1826f4-24c4-4aac-8c2e-eff45df37783"); +LLUUID const SND_WOOD_WOOD ("063c97d3-033a-4e9b-98d8-05c8074922cb"); + + +LLUUID const SND_SLIDE_FLESH_FLESH ("614eec22-f73d-4fdc-8691-a37dc5c58333"); +LLUUID const SND_SLIDE_FLESH_PLASTIC (SND_NULL); +LLUUID const SND_SLIDE_FLESH_RUBBER (SND_NULL); +LLUUID const SND_SLIDE_FLESH_FABRIC ("3678b9b9-2a0c-42b5-9c83-80b64ad6e898"); +LLUUID const SND_SLIDE_FLESH_GRAVEL ("02eaa42a-ce1a-4b6b-9c38-cd7ad0e8f4a6"); +LLUUID const SND_SLIDE_FLESH_GRAVEL_02 ("e7d3b501-79f8-4419-b842-ab6843e0f840"); +LLUUID const SND_SLIDE_FLESH_GRAVEL_03 ("4c3e8b52-6244-4e44-85a6-f4ab994418ed"); +LLUUID const SND_SLIDE_GLASS_GRAVEL ("ca491e77-5c47-4ea1-8021-b3ebbf636cab"); +LLUUID const SND_SLIDE_GLASS_GRAVEL_02 ("30794d49-91ce-48e3-a527-c06f67bd6cbe"); +LLUUID const SND_SLIDE_GLASS_GRAVEL_03 ("04c78e54-fd8d-46b6-8ab9-7678b5d6e5cb"); +LLUUID const SND_SLIDE_GLASS_FLESH (SND_NULL); +LLUUID const SND_SLIDE_GLASS_GLASS (SND_NULL); +LLUUID const SND_SLIDE_GLASS_PLASTIC (SND_NULL); +LLUUID const SND_SLIDE_GLASS_RUBBER (SND_NULL); +LLUUID const SND_SLIDE_GLASS_WOOD (SND_NULL); +LLUUID const SND_SLIDE_METAL_FABRIC ("18b66e81-2958-42d4-a373-7a5054919adc"); +LLUUID const SND_SLIDE_METAL_FLESH ("dde65837-633c-4841-af2f-62ec471bf61e"); +LLUUID const SND_SLIDE_METAL_FLESH_02 ("f3cc2cbe-1a1a-4db7-a8d2-e9c8f8fa1f4f"); +LLUUID const SND_SLIDE_METAL_GLASS ("4188be39-7b1f-4495-bf2b-83ddd82eea05"); +LLUUID const SND_SLIDE_METAL_GLASS_02 ("336faa2b-9d96-4e14-93ad-b63b60074379"); +LLUUID const SND_SLIDE_METAL_GLASS_03 ("34d912aa-cf73-4462-b7d0-dcba2c66caba"); +LLUUID const SND_SLIDE_METAL_GLASS_04 ("97ffc063-e872-4469-8e95-1450ac6bad2b"); +LLUUID const SND_SLIDE_METAL_GRAVEL ("2bbff37d-009a-4cfc-9a0d-817652c08fbe"); +LLUUID const SND_SLIDE_METAL_GRAVEL_02 ("a906a228-783b-49e7-9f0a-e20a41d0e39f"); +LLUUID const SND_SLIDE_METAL_METAL ("09461277-c691-45de-b2c5-89dfd3712f79"); +LLUUID const SND_SLIDE_METAL_METAL_02 ("e00a5d97-8fdc-46c1-bd53-7e312727466c"); +LLUUID const SND_SLIDE_METAL_METAL_03 ("8ebfa780-c440-4b52-ab65-5edf3bc15bf1"); +LLUUID const SND_SLIDE_METAL_METAL_04 ("d6d03cb2-5b16-4e31-b7d4-2a81d2a0909b"); +LLUUID const SND_SLIDE_METAL_METAL_05 ("3a46f447-916e-47de-a1e5-95d1af46bd0f"); +LLUUID const SND_SLIDE_METAL_METAL_06 ("cd423231-e70d-4fd2-ad26-f1c6cf5f0610"); +LLUUID const SND_SLIDE_METAL_PLASTIC (SND_NULL); +LLUUID const SND_SLIDE_METAL_RUBBER ("12d97bc0-3c15-4744-b6bd-77d1316eb4f0"); +LLUUID const SND_SLIDE_METAL_WOOD ("4afb6926-a73f-4cb7-85d5-0f9a40107434"); +LLUUID const SND_SLIDE_METAL_WOOD_02 ("349970bf-187d-4bcb-b2cf-e7bb6581590f"); +LLUUID const SND_SLIDE_METAL_WOOD_03 ("64bf6e87-73d4-4cb4-84f7-55cecfd97cd3"); +LLUUID const SND_SLIDE_METAL_WOOD_04 ("0dc670a9-dbe8-41bc-b8ee-4d96d99219d5"); +LLUUID const SND_SLIDE_METAL_WOOD_05 ("6e3cc57b-c9aa-4829-86a1-8e82aeaccb47"); +LLUUID const SND_SLIDE_METAL_WOOD_06 ("c1237f4c-8c88-4da1-bfbc-2af26a8d9e5a"); +LLUUID const SND_SLIDE_METAL_WOOD_07 ("0e1ec243-063b-4dcb-a903-52b8dffed3d2"); +LLUUID const SND_SLIDE_METAL_WOOD_08 ("66736d0f-533d-4007-a8ee-0f27c2034126"); +LLUUID const SND_SLIDE_PLASTIC_GRAVEL ("35092c21-5c48-4b4d-a818-3cf240af2348"); +LLUUID const SND_SLIDE_PLASTIC_GRAVEL_02("c37f5776-0020-47e8-89a0-c74cc6f5742d"); +LLUUID const SND_SLIDE_PLASTIC_GRAVEL_03("d2fc8db6-2e66-464a-8ccb-f99b61ee4987"); +LLUUID const SND_SLIDE_PLASTIC_GRAVEL_04("93cbdb10-6e82-4c0b-a547-7b3b79ac25f6"); +LLUUID const SND_SLIDE_PLASTIC_GRAVEL_05("2f6d0542-fcd1-4264-a17b-f57bf5ebf402"); +LLUUID const SND_SLIDE_PLASTIC_GRAVEL_06("5b8887d4-3be2-45a0-b25d-85af3b1e6392"); +LLUUID const SND_SLIDE_PLASTIC_PLASTIC (SND_NULL); +LLUUID const SND_SLIDE_PLASTIC_PLASTIC_02 (SND_NULL); +LLUUID const SND_SLIDE_PLASTIC_PLASTIC_03 (SND_NULL); +LLUUID const SND_SLIDE_PLASTIC_FABRIC ("7294d9ad-3e41-4373-992c-a9f21d5d66ad"); +LLUUID const SND_SLIDE_PLASTIC_FABRIC_02("58608ce1-f524-472f-b447-bbe6ce4a46e0"); +LLUUID const SND_SLIDE_PLASTIC_FABRIC_03("06ae285e-0b34-4ea6-84ab-9c6c31b414fc"); +LLUUID const SND_SLIDE_PLASTIC_FABRIC_04("211613db-0461-49bd-9554-5c14ad8b31f6"); +LLUUID const SND_SLIDE_RUBBER_PLASTIC ("a98ffa5a-e48e-4f9d-9242-b9a3210ad84a"); +LLUUID const SND_SLIDE_RUBBER_PLASTIC_02 ("d4136c40-eeaa-49c6-a982-8e5a16f5d93a"); +LLUUID const SND_SLIDE_RUBBER_PLASTIC_03 ("29ec0fb2-0b23-47b2-835b-c83cc7cf9fb0"); +LLUUID const SND_SLIDE_RUBBER_RUBBER (SND_NULL); +LLUUID const SND_SLIDE_STONE_FLESH (SND_NULL); +LLUUID const SND_SLIDE_STONE_GLASS (SND_NULL); +LLUUID const SND_SLIDE_STONE_METAL (SND_NULL); +LLUUID const SND_SLIDE_STONE_PLASTIC ("afd0bcc3-d41a-4572-9e7f-08a29eeb0b8a"); +LLUUID const SND_SLIDE_STONE_PLASTIC_02 ("881b720a-96cf-4128-bb98-5d87e03e93c7"); +LLUUID const SND_SLIDE_STONE_PLASTIC_03 ("293dac42-658a-4c5a-a7a2-6d4c5e5658b0"); +LLUUID const SND_SLIDE_STONE_RUBBER ("0724b946-6a3f-4eeb-bb50-0a3b33120974"); +LLUUID const SND_SLIDE_STONE_RUBBER_02 ("ada93d00-76e2-4bf1-9ad9-493727630717"); +LLUUID const SND_SLIDE_STONE_STONE ("ade766dc-2e75-4699-9b41-7c8e53d2b3f2"); +LLUUID const SND_SLIDE_STONE_STONE_02 ("66698375-6594-47b0-8046-c3973de1291d"); +LLUUID const SND_SLIDE_STONE_WOOD ("174ef324-ed50-4f65-9479-b4da580aeb3c"); +LLUUID const SND_SLIDE_STONE_WOOD_02 ("33d517fd-ff11-4d01-a7b5-0e3abf818dcf"); +LLUUID const SND_SLIDE_STONE_WOOD_03 ("1bac4b63-e6fd-4659-9761-991284cf4582"); +LLUUID const SND_SLIDE_STONE_WOOD_04 ("a7d28564-6821-4c01-a378-cde98fba7ba9"); +LLUUID const SND_SLIDE_WOOD_FABRIC ("22c58e74-22cd-4960-9ab7-5bf08ab824e5"); +LLUUID const SND_SLIDE_WOOD_FABRIC_02 ("0b0ed22e-4a0f-4617-a4cf-20d0f2b78ccc"); +LLUUID const SND_SLIDE_WOOD_FABRIC_03 ("42b80abb-9823-4b74-a210-326ccf23636a"); +LLUUID const SND_SLIDE_WOOD_FABRIC_04 ("8538298a-1e6b-4b69-a9ee-5e01e4a02b35"); +LLUUID const SND_SLIDE_WOOD_FLESH ("84b026f3-a11c-4366-aa7c-07edcd89b2bb"); +LLUUID const SND_SLIDE_WOOD_FLESH_02 ("2644191f-4848-47ba-8ba7-bddc0bfcb3da"); +LLUUID const SND_SLIDE_WOOD_FLESH_03 ("edb978e4-9be9-456f-b2fc-e8502bfe25be"); +LLUUID const SND_SLIDE_WOOD_FLESH_04 ("bf2b972e-f42a-46d7-b53e-5fca38f5bc61"); +LLUUID const SND_SLIDE_WOOD_GRAVEL ("d063bb4d-0eff-4403-a6cc-c6c6c073e624"); +LLUUID const SND_SLIDE_WOOD_GRAVEL_02 ("511eb679-6d93-47fa-9141-c3ef9261c919"); +LLUUID const SND_SLIDE_WOOD_GRAVEL_03 ("4ed1fd43-4707-4e5c-b7b7-21ec4e72c1ac"); +LLUUID const SND_SLIDE_WOOD_GRAVEL_04 ("99ea89b3-aa76-4b87-99c8-670365c6d8c3"); +LLUUID const SND_SLIDE_WOOD_PLASTIC ("505ca3c4-94a0-4e28-8fc1-ea72a428396b"); +LLUUID const SND_SLIDE_WOOD_PLASTIC_02 ("fc404011-df71-4ed0-8f22-b72bdd18f63c"); +LLUUID const SND_SLIDE_WOOD_PLASTIC_03 ("67dbe225-26df-4efa-8c8b-f1ef669fec45"); +LLUUID const SND_SLIDE_WOOD_RUBBER (SND_NULL); +LLUUID const SND_SLIDE_WOOD_WOOD ("3079d569-b3e8-4df4-9e09-f0d4611213ef"); +LLUUID const SND_SLIDE_WOOD_WOOD_02 ("276b093d-dbcb-4279-a89e-a54b0b416af6"); +LLUUID const SND_SLIDE_WOOD_WOOD_03 ("c3f3ca5e-2768-4081-847f-247139310fdb"); +LLUUID const SND_SLIDE_WOOD_WOOD_04 ("f08d44b8-ff87-4a98-9561-c72f1f2fec81"); +LLUUID const SND_SLIDE_WOOD_WOOD_05 ("2d8a58cf-f139-4238-8503-27d334d05c85"); +LLUUID const SND_SLIDE_WOOD_WOOD_06 ("e157ebbd-b12d-4225-aa7c-d47b026a7687"); +LLUUID const SND_SLIDE_WOOD_WOOD_07 ("35e17956-e7b4-478c-b274-e37db8a166b2"); +LLUUID const SND_SLIDE_WOOD_WOOD_08 ("e606fc65-0643-4964-9979-ff964fa6a62c"); + + +LLUUID const SND_ROLL_FLESH_FLESH (SND_NULL); +LLUUID const SND_ROLL_FLESH_PLASTIC ("89a0be4c-848d-4a6e-8886-298f56c2cff4"); +LLUUID const SND_ROLL_FLESH_PLASTIC_02 ("beb06343-1aa1-4af2-b320-5d2ec31c53b1"); +LLUUID const SND_ROLL_FLESH_RUBBER (SND_NULL); +LLUUID const SND_ROLL_GLASS_GRAVEL ("ba795c74-7e09-4572-b495-e09886a46b86"); +LLUUID const SND_ROLL_GLASS_GRAVEL_02 ("4c93c3b7-14cb-4d9b-a7df-628ad935f1f2"); +LLUUID const SND_ROLL_GLASS_FLESH (SND_NULL); +LLUUID const SND_ROLL_GLASS_GLASS (SND_NULL); +LLUUID const SND_ROLL_GLASS_PLASTIC (SND_NULL); +LLUUID const SND_ROLL_GLASS_RUBBER (SND_NULL); +LLUUID const SND_ROLL_GLASS_WOOD ("d40b1f48-a061-4f6e-b18f-4326a3dd5c29"); +LLUUID const SND_ROLL_GLASS_WOOD_02 ("78cd407a-bb36-4163-ba09-20f2e6d9d44b"); +LLUUID const SND_ROLL_GRAVEL_GRAVEL ("c7354cc3-6df5-4738-8dbb-b28a6ac46a05"); +LLUUID const SND_ROLL_GRAVEL_GRAVEL_02 ("01d194c4-72a6-47df-81a5-8db430faff87"); +LLUUID const SND_ROLL_METAL_FABRIC ("ce6e6564-20fd-48e4-81e2-cd3f81c00a3e"); +LLUUID const SND_ROLL_METAL_FABRIC_02 ("fc4d0065-32f6-4bb0-9f3f-f4737eb27163"); +LLUUID const SND_ROLL_METAL_FLESH (SND_NULL); +LLUUID const SND_ROLL_METAL_GLASS ("63d530bb-a41f-402b-aa1f-be6b11959809"); +LLUUID const SND_ROLL_METAL_GLASS_02 ("f62642c2-6db5-4faa-8b77-939067d837c3"); +LLUUID const SND_ROLL_METAL_GLASS_03 ("db5b5a15-2817-4cd7-9f0b-9ad49b5e52c8"); +LLUUID const SND_ROLL_METAL_GRAVEL ("447164e3-9646-4c1a-a16d-606892891466"); +LLUUID const SND_ROLL_METAL_METAL ("c3c22cf3-5d1f-4cc3-b4b5-708b9f65979c"); +LLUUID const SND_ROLL_METAL_METAL_02 ("d8386277-a1ea-460e-b6fd-bb285c323bf1"); +LLUUID const SND_ROLL_METAL_METAL_03 ("69ee1f02-f9cd-4c8b-aedd-39a2d6705680"); +LLUUID const SND_ROLL_METAL_METAL_04 ("5cc6b5fd-26ce-47ad-b21d-3a7c190dd375"); +LLUUID const SND_ROLL_METAL_PLASTIC ("c6a9bbf6-df15-4713-9f84-7237fce4051e"); +LLUUID const SND_ROLL_METAL_PLASTIC_01 ("0fedb59b-2dbb-4cec-b6cc-8559ec027749"); +LLUUID const SND_ROLL_METAL_RUBBER (SND_NULL); +LLUUID const SND_ROLL_METAL_WOOD ("1d76af57-01b1-4c73-9a1d-69523bfa50ea"); +LLUUID const SND_ROLL_METAL_WOOD_02 ("78aa4e71-8e7c-4b90-a561-3ebdc639f99b"); +LLUUID const SND_ROLL_METAL_WOOD_03 ("777d95bf-962f-48fa-93bf-8c1806557d72"); +LLUUID const SND_ROLL_METAL_WOOD_04 ("1833da76-45e2-4a8b-97da-d17413e056c9"); +LLUUID const SND_ROLL_METAL_WOOD_05 ("b13e1232-3d8d-42e9-92ec-b30f9f823962"); +LLUUID const SND_ROLL_PLASTIC_FABRIC ("616a1f03-209f-4c55-b264-83a000b6ef0a"); +LLUUID const SND_ROLL_PLASTIC_PLASTIC ("873f3d82-00b2-4082-9c69-7aef3461dba1"); +LLUUID const SND_ROLL_PLASTIC_PLASTIC_02 ("cc39879f-ebc8-4405-a4fc-8342f5bed31e"); +LLUUID const SND_ROLL_RUBBER_PLASTIC (SND_NULL); +LLUUID const SND_ROLL_RUBBER_RUBBER (SND_NULL); +LLUUID const SND_ROLL_STONE_FLESH (SND_NULL); +LLUUID const SND_ROLL_STONE_GLASS (SND_NULL); +LLUUID const SND_ROLL_STONE_METAL (SND_NULL); +LLUUID const SND_ROLL_STONE_PLASTIC ("155f65a8-cae7-476e-a58b-fd362be7fd0e"); +LLUUID const SND_ROLL_STONE_RUBBER (SND_NULL); +LLUUID const SND_ROLL_STONE_STONE ("67d56e3f-6ed5-4658-9418-14f020c38b11"); +LLUUID const SND_ROLL_STONE_STONE_02 ("43d99d10-d75b-4246-accf-4ceb2c909aa7"); +LLUUID const SND_ROLL_STONE_STONE_03 ("f04e83ff-eed7-4e99-8f45-eb97e4e1d3b7"); +LLUUID const SND_ROLL_STONE_STONE_04 ("10fcc5ad-fa89-48d6-b774-986b580c1efc"); +LLUUID const SND_ROLL_STONE_STONE_05 ("3d86f5a3-1a91-49d9-b99f-8521a7422497"); +LLUUID const SND_ROLL_STONE_WOOD ("53e46fb7-6c21-4fe1-bffe-0567475d48fa"); +LLUUID const SND_ROLL_STONE_WOOD_02 ("5eba8c9a-a014-4299-87f1-315c45ec795b"); +LLUUID const SND_ROLL_STONE_WOOD_03 ("ea6c05fc-6e9c-4526-8a20-bc47810bb549"); +LLUUID const SND_ROLL_STONE_WOOD_04 ("64618cbf-3f42-4728-8094-e77807545efb"); +LLUUID const SND_ROLL_WOOD_FLESH ("26ee185d-6fc3-49f8-89ba-51cab04cfc42"); +LLUUID const SND_ROLL_WOOD_FLESH_02 ("334faa25-1e80-4c99-b29f-4c9c2a3d079d"); +LLUUID const SND_ROLL_WOOD_FLESH_03 ("2f876626-4dce-4f71-a91e-a25302edfab7"); +LLUUID const SND_ROLL_WOOD_FLESH_04 ("d6877aac-07fc-4931-bcde-585f223802ad"); +LLUUID const SND_ROLL_WOOD_GRAVEL ("2a23ebb5-a4a2-4f1f-8d75-7384239354aa"); +LLUUID const SND_ROLL_WOOD_GRAVEL_02 ("208bf26d-f097-450c-95c4-9d26317c613c"); +LLUUID const SND_ROLL_WOOD_GRAVEL_03 ("a26ecaf4-92c6-4e32-9864-56b7c70cab8e"); +LLUUID const SND_ROLL_WOOD_PLASTIC ("71c1000a-9f16-4cc3-8ede-ec4aa3bf5723"); +LLUUID const SND_ROLL_WOOD_PLASTIC_02 ("7bc20ba6-1e6d-4eea-83ad-c5cc3ae0e409"); +LLUUID const SND_ROLL_WOOD_RUBBER (SND_NULL); +LLUUID const SND_ROLL_WOOD_WOOD ("2cc8eec4-bb4a-4ba8-b783-71526ec708e8"); +LLUUID const SND_ROLL_WOOD_WOOD_02 ("0a1f8070-a11a-4b4c-b260-5ffb6acb0a5d"); +LLUUID const SND_ROLL_WOOD_WOOD_03 ("160bef64-da9c-4be8-b07b-a5060b501700"); +LLUUID const SND_ROLL_WOOD_WOOD_04 ("1c62ea16-cc60-48ed-829a-68b8f4cf0c1c"); +LLUUID const SND_ROLL_WOOD_WOOD_05 ("be9cc8fe-b920-4bf5-8924-453088cbc03f"); +LLUUID const SND_ROLL_WOOD_WOOD_06 ("a76cfe60-56b0-43b1-8f31-93e56947d78b"); +LLUUID const SND_ROLL_WOOD_WOOD_07 ("0c6aa481-b5bc-4573-ae83-8e16ff27e750"); +LLUUID const SND_ROLL_WOOD_WOOD_08 ("214ab2c7-871a-451b-b0db-4c5677199011"); +LLUUID const SND_ROLL_WOOD_WOOD_09 ("0086e4db-3ac6-4545-b414-6f359bedd9a5"); + +LLUUID const SND_SLIDE_STONE_STONE_01 ("2a7dcbd1-d3e6-4767-8432-8322648e7b9d"); + +LLUUID const SND_STONE_DIRT_01 ("97727335-392c-4338-ac4b-23a7883279c2"); +LLUUID const SND_STONE_DIRT_02 ("cbe75eb2-3375-41d8-9e3f-2ae46b4164ed"); +LLUUID const SND_STONE_DIRT_03 ("31e236ee-001b-4c8e-ad6c-c2074cb64357"); +LLUUID const SND_STONE_DIRT_04 ("c8091652-e04b-4a11-84ba-15dba06e7a1b"); + +LLUUID const SND_STONE_STONE_02 ("ba4ef5ac-7435-4240-b826-c24ba8fa5a78"); +LLUUID const SND_STONE_STONE_04 ("ea296329-0f09-4993-af1b-e6784bab1dc9"); diff --git a/linden/indra/llmessage/sound_ids.h b/linden/indra/llmessage/sound_ids.h index e7a9190..038e857 100644 --- a/linden/indra/llmessage/sound_ids.h +++ b/linden/indra/llmessage/sound_ids.h @@ -35,283 +35,260 @@ #include "lluuid.h" -const LLUUID SND_NULL = LLUUID::null; -const LLUUID SND_RIDE ("00000000-0000-0000-0000-000000000100"); -const LLUUID SND_SHOT ("00000000-0000-0000-0000-000000000101"); -const LLUUID SND_MORTAR ("00000000-0000-0000-0000-000000000102"); -const LLUUID SND_HIT ("00000000-0000-0000-0000-000000000103"); -const LLUUID SND_EXPLOSION ("00000000-0000-0000-0000-000000000104"); -const LLUUID SND_BOING ("00000000-0000-0000-0000-000000000105"); -const LLUUID SND_OBJECT_CREATE ("9f1bc096-3592-411e-9b0b-c447a9ff054c"); +extern LLUUID const SND_NULL; +extern LLUUID const SND_RIDE; +extern LLUUID const SND_SHOT; +extern LLUUID const SND_MORTAR; +extern LLUUID const SND_HIT; +extern LLUUID const SND_EXPLOSION; +extern LLUUID const SND_BOING; +extern LLUUID const SND_OBJECT_CREATE; // // Different bird sounds for different states // -const LLUUID SND_CHIRP ("00000000-0000-0000-0000-000000000106"); // Flying random chirp -const LLUUID SND_CHIRP2 ("828a9526-175b-455d-8af0-0e3c0fb602b2"); // Spooked by user -const LLUUID SND_CHIRP3 ("f99772d6-1ce6-4a39-a28b-06d26c94c9e3"); // Spooked by object -const LLUUID SND_CHIRP4 ("54472ca4-7fc9-42cb-b7d5-99ad5b12bd50"); // Chasing other bird -const LLUUID SND_CHIRP5 ("2929964f-fac5-40d7-9179-2864a8fa9ace"); // Hopping random chirp -const LLUUID SND_CHIRPDEAD ("9abff1d3-863a-4e04-bd83-3834fd7fcff4"); // Hit by grenade - dead! +extern LLUUID const SND_CHIRP; +extern LLUUID const SND_CHIRP2; +extern LLUUID const SND_CHIRP3; +extern LLUUID const SND_CHIRP4; +extern LLUUID const SND_CHIRP5; +extern LLUUID const SND_CHIRPDEAD; -const LLUUID SND_MUNCH ("00000000-0000-0000-0000-000000000107"); -const LLUUID SND_PUNCH ("00000000-0000-0000-0000-000000000108"); -const LLUUID SND_SPLASH ("00000000-0000-0000-0000-000000000109"); -const LLUUID SND_CLICK ("00000000-0000-0000-0000-000000000110"); -const LLUUID SND_WHISTLE ("ab858f9a-1f44-4d39-9b33-351543d03ccb"); -const LLUUID SND_TYPING ("5e191c7b-8996-9ced-a177-b2ac32bfea06"); +extern LLUUID const SND_MUNCH; +extern LLUUID const SND_PUNCH; +extern LLUUID const SND_SPLASH; +extern LLUUID const SND_CLICK; +extern LLUUID const SND_WHISTLE; +extern LLUUID const SND_TYPING; -const LLUUID SND_ARROW_SHOT ("00000000-0000-0000-0000-000000000111"); -const LLUUID SND_ARROW_THUD ("00000000-0000-0000-0000-000000000112"); -const LLUUID SND_LASER_SHOT ("00000000-0000-0000-0000-000000000113"); -const LLUUID SND_JET_THRUST ("67f5e4f0-0534-4d97-bc01-f297648d20e0"); +extern LLUUID const SND_ARROW_SHOT; +extern LLUUID const SND_ARROW_THUD; +extern LLUUID const SND_LASER_SHOT; +extern LLUUID const SND_JET_THRUST; -const LLUUID SND_SILENCE ("00000000-0000-0000-0000-000000000114"); -const LLUUID SND_BUBBLES ("00000000-0000-0000-0000-000000000115"); -const LLUUID SND_WELCOME ("00000000-0000-0000-0000-000000000116"); -const LLUUID SND_SQUISH ("00000000-0000-0000-0000-000000000117"); -const LLUUID SND_SUBPOD ("00000000-0000-0000-0000-000000000118"); -const LLUUID SND_FOOTSTEPS ("00000000-0000-0000-0000-000000000119"); -const LLUUID SND_STEP_LEFT ("00000000-0000-0000-0000-000000000124"); -const LLUUID SND_STEP_RIGHT ("00000000-0000-0000-0000-000000000125"); +extern LLUUID const SND_SILENCE; +extern LLUUID const SND_BUBBLES; +extern LLUUID const SND_WELCOME; +extern LLUUID const SND_SQUISH; +extern LLUUID const SND_SUBPOD; +extern LLUUID const SND_FOOTSTEPS; +extern LLUUID const SND_STEP_LEFT; +extern LLUUID const SND_STEP_RIGHT; -const LLUUID SND_BALL_COLLISION ("00000000-0000-0000-0000-000000000120"); +extern LLUUID const SND_BALL_COLLISION; -const LLUUID SND_OOOH_SCARE_ME ("00000000-0000-0000-0000-000000000121"); -const LLUUID SND_PAYBACK_TIME ("00000000-0000-0000-0000-000000000122"); -const LLUUID SND_READY_FOR_BATTLE ("00000000-0000-0000-0000-000000000123"); +extern LLUUID const SND_OOOH_SCARE_ME; +extern LLUUID const SND_PAYBACK_TIME; +extern LLUUID const SND_READY_FOR_BATTLE; -const LLUUID SND_FLESH_FLESH ("dce5fdd4-afe4-4ea1-822f-dd52cac46b08"); -const LLUUID SND_FLESH_PLASTIC ("51011582-fbca-4580-ae9e-1a5593f094ec"); -const LLUUID SND_FLESH_RUBBER ("68d62208-e257-4d0c-bbe2-20c9ea9760bb"); -const LLUUID SND_GLASS_FLESH ("75872e8c-bc39-451b-9b0b-042d7ba36cba"); -const LLUUID SND_GLASS_GLASS ("6a45ba0b-5775-4ea8-8513-26008a17f873"); -const LLUUID SND_GLASS_PLASTIC ("992a6d1b-8c77-40e0-9495-4098ce539694"); -const LLUUID SND_GLASS_RUBBER ("2de4da5a-faf8-46be-bac6-c4d74f1e5767"); -const LLUUID SND_GLASS_WOOD ("6e3fb0f7-6d9c-42ca-b86b-1122ff562d7d"); -const LLUUID SND_METAL_FLESH ("14209133-4961-4acc-9649-53fc38ee1667"); -const LLUUID SND_METAL_GLASS ("bc4a4348-cfcc-4e5e-908e-8a52a8915fe6"); -const LLUUID SND_METAL_METAL ("9e5c1297-6eed-40c0-825a-d9bcd86e3193"); -const LLUUID SND_METAL_PLASTIC ("e534761c-1894-4b61-b20c-658a6fb68157"); -const LLUUID SND_METAL_RUBBER ("8761f73f-6cf9-4186-8aaa-0948ed002db1"); -const LLUUID SND_METAL_WOOD ("874a26fd-142f-4173-8c5b-890cd846c74d"); -const LLUUID SND_PLASTIC_PLASTIC ("0e24a717-b97e-4b77-9c94-b59a5a88b2da"); -const LLUUID SND_RUBBER_PLASTIC ("75cf3ade-9a5b-4c4d-bb35-f9799bda7fb2"); -const LLUUID SND_RUBBER_RUBBER ("153c8bf7-fb89-4d89-b263-47e58b1b4774"); -const LLUUID SND_STONE_FLESH ("55c3e0ce-275a-46fa-82ff-e0465f5e8703"); -const LLUUID SND_STONE_GLASS ("24babf58-7156-4841-9a3f-761bdbb8e237"); -const LLUUID SND_STONE_METAL ("aca261d8-e145-4610-9e20-9eff990f2c12"); -const LLUUID SND_STONE_PLASTIC ("0642fba6-5dcf-4d62-8e7b-94dbb529d117"); -const LLUUID SND_STONE_RUBBER ("25a863e8-dc42-4e8a-a357-e76422ace9b5"); -const LLUUID SND_STONE_STONE ("9538f37c-456e-4047-81be-6435045608d4"); -const LLUUID SND_STONE_WOOD ("8c0f84c3-9afd-4396-b5f5-9bca2c911c20"); -const LLUUID SND_WOOD_FLESH ("be582e5d-b123-41a2-a150-454c39e961c8"); -const LLUUID SND_WOOD_PLASTIC ("c70141d4-ba06-41ea-bcbc-35ea81cb8335"); -const LLUUID SND_WOOD_RUBBER ("7d1826f4-24c4-4aac-8c2e-eff45df37783"); -const LLUUID SND_WOOD_WOOD ("063c97d3-033a-4e9b-98d8-05c8074922cb"); +extern LLUUID const SND_FLESH_FLESH; +extern LLUUID const SND_FLESH_PLASTIC; +extern LLUUID const SND_FLESH_RUBBER; +extern LLUUID const SND_GLASS_FLESH; +extern LLUUID const SND_GLASS_GLASS; +extern LLUUID const SND_GLASS_PLASTIC; +extern LLUUID const SND_GLASS_RUBBER; +extern LLUUID const SND_GLASS_WOOD; +extern LLUUID const SND_METAL_FLESH; +extern LLUUID const SND_METAL_GLASS; +extern LLUUID const SND_METAL_METAL; +extern LLUUID const SND_METAL_PLASTIC; +extern LLUUID const SND_METAL_RUBBER; +extern LLUUID const SND_METAL_WOOD; +extern LLUUID const SND_PLASTIC_PLASTIC; +extern LLUUID const SND_RUBBER_PLASTIC; +extern LLUUID const SND_RUBBER_RUBBER; +extern LLUUID const SND_STONE_FLESH; +extern LLUUID const SND_STONE_GLASS; +extern LLUUID const SND_STONE_METAL; +extern LLUUID const SND_STONE_PLASTIC; +extern LLUUID const SND_STONE_RUBBER; +extern LLUUID const SND_STONE_STONE; +extern LLUUID const SND_STONE_WOOD; +extern LLUUID const SND_WOOD_FLESH; +extern LLUUID const SND_WOOD_PLASTIC; +extern LLUUID const SND_WOOD_RUBBER; +extern LLUUID const SND_WOOD_WOOD; +extern LLUUID const SND_SLIDE_FLESH_FLESH; +extern LLUUID const SND_SLIDE_FLESH_PLASTIC; +extern LLUUID const SND_SLIDE_FLESH_RUBBER; +extern LLUUID const SND_SLIDE_FLESH_FABRIC; +extern LLUUID const SND_SLIDE_FLESH_GRAVEL; +extern LLUUID const SND_SLIDE_FLESH_GRAVEL_02; +extern LLUUID const SND_SLIDE_FLESH_GRAVEL_03; +extern LLUUID const SND_SLIDE_GLASS_GRAVEL; +extern LLUUID const SND_SLIDE_GLASS_GRAVEL_02; +extern LLUUID const SND_SLIDE_GLASS_GRAVEL_03; +extern LLUUID const SND_SLIDE_GLASS_FLESH; +extern LLUUID const SND_SLIDE_GLASS_GLASS; +extern LLUUID const SND_SLIDE_GLASS_PLASTIC; +extern LLUUID const SND_SLIDE_GLASS_RUBBER; +extern LLUUID const SND_SLIDE_GLASS_WOOD; +extern LLUUID const SND_SLIDE_METAL_FABRIC; +extern LLUUID const SND_SLIDE_METAL_FLESH; +extern LLUUID const SND_SLIDE_METAL_FLESH_02; +extern LLUUID const SND_SLIDE_METAL_GLASS; +extern LLUUID const SND_SLIDE_METAL_GLASS_02; +extern LLUUID const SND_SLIDE_METAL_GLASS_03; +extern LLUUID const SND_SLIDE_METAL_GLASS_04; +extern LLUUID const SND_SLIDE_METAL_GRAVEL; +extern LLUUID const SND_SLIDE_METAL_GRAVEL_02; +extern LLUUID const SND_SLIDE_METAL_METAL; +extern LLUUID const SND_SLIDE_METAL_METAL_02; +extern LLUUID const SND_SLIDE_METAL_METAL_03; +extern LLUUID const SND_SLIDE_METAL_METAL_04; +extern LLUUID const SND_SLIDE_METAL_METAL_05; +extern LLUUID const SND_SLIDE_METAL_METAL_06; +extern LLUUID const SND_SLIDE_METAL_PLASTIC; +extern LLUUID const SND_SLIDE_METAL_RUBBER; +extern LLUUID const SND_SLIDE_METAL_WOOD; +extern LLUUID const SND_SLIDE_METAL_WOOD_02; +extern LLUUID const SND_SLIDE_METAL_WOOD_03; +extern LLUUID const SND_SLIDE_METAL_WOOD_04; +extern LLUUID const SND_SLIDE_METAL_WOOD_05; +extern LLUUID const SND_SLIDE_METAL_WOOD_06; +extern LLUUID const SND_SLIDE_METAL_WOOD_07; +extern LLUUID const SND_SLIDE_METAL_WOOD_08; +extern LLUUID const SND_SLIDE_PLASTIC_GRAVEL; +extern LLUUID const SND_SLIDE_PLASTIC_GRAVEL_02; +extern LLUUID const SND_SLIDE_PLASTIC_GRAVEL_03; +extern LLUUID const SND_SLIDE_PLASTIC_GRAVEL_04; +extern LLUUID const SND_SLIDE_PLASTIC_GRAVEL_05; +extern LLUUID const SND_SLIDE_PLASTIC_GRAVEL_06; +extern LLUUID const SND_SLIDE_PLASTIC_PLASTIC; +extern LLUUID const SND_SLIDE_PLASTIC_PLASTIC_02; +extern LLUUID const SND_SLIDE_PLASTIC_PLASTIC_03; +extern LLUUID const SND_SLIDE_PLASTIC_FABRIC; +extern LLUUID const SND_SLIDE_PLASTIC_FABRIC_02; +extern LLUUID const SND_SLIDE_PLASTIC_FABRIC_03; +extern LLUUID const SND_SLIDE_PLASTIC_FABRIC_04; +extern LLUUID const SND_SLIDE_RUBBER_PLASTIC; +extern LLUUID const SND_SLIDE_RUBBER_PLASTIC_02; +extern LLUUID const SND_SLIDE_RUBBER_PLASTIC_03; +extern LLUUID const SND_SLIDE_RUBBER_RUBBER; +extern LLUUID const SND_SLIDE_STONE_FLESH; +extern LLUUID const SND_SLIDE_STONE_GLASS; +extern LLUUID const SND_SLIDE_STONE_METAL; +extern LLUUID const SND_SLIDE_STONE_PLASTIC; +extern LLUUID const SND_SLIDE_STONE_PLASTIC_02; +extern LLUUID const SND_SLIDE_STONE_PLASTIC_03; +extern LLUUID const SND_SLIDE_STONE_RUBBER; +extern LLUUID const SND_SLIDE_STONE_RUBBER_02; +extern LLUUID const SND_SLIDE_STONE_STONE; +extern LLUUID const SND_SLIDE_STONE_STONE_02; +extern LLUUID const SND_SLIDE_STONE_WOOD; +extern LLUUID const SND_SLIDE_STONE_WOOD_02; +extern LLUUID const SND_SLIDE_STONE_WOOD_03; +extern LLUUID const SND_SLIDE_STONE_WOOD_04; +extern LLUUID const SND_SLIDE_WOOD_FABRIC; +extern LLUUID const SND_SLIDE_WOOD_FABRIC_02; +extern LLUUID const SND_SLIDE_WOOD_FABRIC_03; +extern LLUUID const SND_SLIDE_WOOD_FABRIC_04; +extern LLUUID const SND_SLIDE_WOOD_FLESH; +extern LLUUID const SND_SLIDE_WOOD_FLESH_02; +extern LLUUID const SND_SLIDE_WOOD_FLESH_03; +extern LLUUID const SND_SLIDE_WOOD_FLESH_04; +extern LLUUID const SND_SLIDE_WOOD_GRAVEL; +extern LLUUID const SND_SLIDE_WOOD_GRAVEL_02; +extern LLUUID const SND_SLIDE_WOOD_GRAVEL_03; +extern LLUUID const SND_SLIDE_WOOD_GRAVEL_04; +extern LLUUID const SND_SLIDE_WOOD_PLASTIC; +extern LLUUID const SND_SLIDE_WOOD_PLASTIC_02; +extern LLUUID const SND_SLIDE_WOOD_PLASTIC_03; +extern LLUUID const SND_SLIDE_WOOD_RUBBER; +extern LLUUID const SND_SLIDE_WOOD_WOOD; +extern LLUUID const SND_SLIDE_WOOD_WOOD_02; +extern LLUUID const SND_SLIDE_WOOD_WOOD_03; +extern LLUUID const SND_SLIDE_WOOD_WOOD_04; +extern LLUUID const SND_SLIDE_WOOD_WOOD_05; +extern LLUUID const SND_SLIDE_WOOD_WOOD_06; +extern LLUUID const SND_SLIDE_WOOD_WOOD_07; +extern LLUUID const SND_SLIDE_WOOD_WOOD_08; -const LLUUID SND_SLIDE_FLESH_FLESH ("614eec22-f73d-4fdc-8691-a37dc5c58333"); -const LLUUID SND_SLIDE_FLESH_PLASTIC (SND_NULL); -const LLUUID SND_SLIDE_FLESH_RUBBER (SND_NULL); -const LLUUID SND_SLIDE_FLESH_FABRIC ("3678b9b9-2a0c-42b5-9c83-80b64ad6e898"); -const LLUUID SND_SLIDE_FLESH_GRAVEL ("02eaa42a-ce1a-4b6b-9c38-cd7ad0e8f4a6"); -const LLUUID SND_SLIDE_FLESH_GRAVEL_02 ("e7d3b501-79f8-4419-b842-ab6843e0f840"); -const LLUUID SND_SLIDE_FLESH_GRAVEL_03 ("4c3e8b52-6244-4e44-85a6-f4ab994418ed"); -const LLUUID SND_SLIDE_GLASS_GRAVEL ("ca491e77-5c47-4ea1-8021-b3ebbf636cab"); -const LLUUID SND_SLIDE_GLASS_GRAVEL_02 ("30794d49-91ce-48e3-a527-c06f67bd6cbe"); -const LLUUID SND_SLIDE_GLASS_GRAVEL_03 ("04c78e54-fd8d-46b6-8ab9-7678b5d6e5cb"); -const LLUUID SND_SLIDE_GLASS_FLESH (SND_NULL); -const LLUUID SND_SLIDE_GLASS_GLASS (SND_NULL); -const LLUUID SND_SLIDE_GLASS_PLASTIC (SND_NULL); -const LLUUID SND_SLIDE_GLASS_RUBBER (SND_NULL); -const LLUUID SND_SLIDE_GLASS_WOOD (SND_NULL); -const LLUUID SND_SLIDE_METAL_FABRIC ("18b66e81-2958-42d4-a373-7a5054919adc"); -const LLUUID SND_SLIDE_METAL_FLESH ("dde65837-633c-4841-af2f-62ec471bf61e"); -const LLUUID SND_SLIDE_METAL_FLESH_02 ("f3cc2cbe-1a1a-4db7-a8d2-e9c8f8fa1f4f"); -const LLUUID SND_SLIDE_METAL_GLASS ("4188be39-7b1f-4495-bf2b-83ddd82eea05"); -const LLUUID SND_SLIDE_METAL_GLASS_02 ("336faa2b-9d96-4e14-93ad-b63b60074379"); -const LLUUID SND_SLIDE_METAL_GLASS_03 ("34d912aa-cf73-4462-b7d0-dcba2c66caba"); -const LLUUID SND_SLIDE_METAL_GLASS_04 ("97ffc063-e872-4469-8e95-1450ac6bad2b"); -const LLUUID SND_SLIDE_METAL_GRAVEL ("2bbff37d-009a-4cfc-9a0d-817652c08fbe"); -const LLUUID SND_SLIDE_METAL_GRAVEL_02 ("a906a228-783b-49e7-9f0a-e20a41d0e39f"); -const LLUUID SND_SLIDE_METAL_METAL ("09461277-c691-45de-b2c5-89dfd3712f79"); -const LLUUID SND_SLIDE_METAL_METAL_02 ("e00a5d97-8fdc-46c1-bd53-7e312727466c"); -const LLUUID SND_SLIDE_METAL_METAL_03 ("8ebfa780-c440-4b52-ab65-5edf3bc15bf1"); -const LLUUID SND_SLIDE_METAL_METAL_04 ("d6d03cb2-5b16-4e31-b7d4-2a81d2a0909b"); -const LLUUID SND_SLIDE_METAL_METAL_05 ("3a46f447-916e-47de-a1e5-95d1af46bd0f"); -const LLUUID SND_SLIDE_METAL_METAL_06 ("cd423231-e70d-4fd2-ad26-f1c6cf5f0610"); -const LLUUID SND_SLIDE_METAL_PLASTIC (SND_NULL); -const LLUUID SND_SLIDE_METAL_RUBBER ("12d97bc0-3c15-4744-b6bd-77d1316eb4f0"); -const LLUUID SND_SLIDE_METAL_WOOD ("4afb6926-a73f-4cb7-85d5-0f9a40107434"); -const LLUUID SND_SLIDE_METAL_WOOD_02 ("349970bf-187d-4bcb-b2cf-e7bb6581590f"); -const LLUUID SND_SLIDE_METAL_WOOD_03 ("64bf6e87-73d4-4cb4-84f7-55cecfd97cd3"); -const LLUUID SND_SLIDE_METAL_WOOD_04 ("0dc670a9-dbe8-41bc-b8ee-4d96d99219d5"); -const LLUUID SND_SLIDE_METAL_WOOD_05 ("6e3cc57b-c9aa-4829-86a1-8e82aeaccb47"); -const LLUUID SND_SLIDE_METAL_WOOD_06 ("c1237f4c-8c88-4da1-bfbc-2af26a8d9e5a"); -const LLUUID SND_SLIDE_METAL_WOOD_07 ("0e1ec243-063b-4dcb-a903-52b8dffed3d2"); -const LLUUID SND_SLIDE_METAL_WOOD_08 ("66736d0f-533d-4007-a8ee-0f27c2034126"); -const LLUUID SND_SLIDE_PLASTIC_GRAVEL ("35092c21-5c48-4b4d-a818-3cf240af2348"); -const LLUUID SND_SLIDE_PLASTIC_GRAVEL_02("c37f5776-0020-47e8-89a0-c74cc6f5742d"); -const LLUUID SND_SLIDE_PLASTIC_GRAVEL_03("d2fc8db6-2e66-464a-8ccb-f99b61ee4987"); -const LLUUID SND_SLIDE_PLASTIC_GRAVEL_04("93cbdb10-6e82-4c0b-a547-7b3b79ac25f6"); -const LLUUID SND_SLIDE_PLASTIC_GRAVEL_05("2f6d0542-fcd1-4264-a17b-f57bf5ebf402"); -const LLUUID SND_SLIDE_PLASTIC_GRAVEL_06("5b8887d4-3be2-45a0-b25d-85af3b1e6392"); -const LLUUID SND_SLIDE_PLASTIC_PLASTIC (SND_NULL); -const LLUUID SND_SLIDE_PLASTIC_PLASTIC_02 (SND_NULL); -const LLUUID SND_SLIDE_PLASTIC_PLASTIC_03 (SND_NULL); -const LLUUID SND_SLIDE_PLASTIC_FABRIC ("7294d9ad-3e41-4373-992c-a9f21d5d66ad"); -const LLUUID SND_SLIDE_PLASTIC_FABRIC_02("58608ce1-f524-472f-b447-bbe6ce4a46e0"); -const LLUUID SND_SLIDE_PLASTIC_FABRIC_03("06ae285e-0b34-4ea6-84ab-9c6c31b414fc"); -const LLUUID SND_SLIDE_PLASTIC_FABRIC_04("211613db-0461-49bd-9554-5c14ad8b31f6"); -const LLUUID SND_SLIDE_RUBBER_PLASTIC ("a98ffa5a-e48e-4f9d-9242-b9a3210ad84a"); -const LLUUID SND_SLIDE_RUBBER_PLASTIC_02 ("d4136c40-eeaa-49c6-a982-8e5a16f5d93a"); -const LLUUID SND_SLIDE_RUBBER_PLASTIC_03 ("29ec0fb2-0b23-47b2-835b-c83cc7cf9fb0"); -const LLUUID SND_SLIDE_RUBBER_RUBBER (SND_NULL); -const LLUUID SND_SLIDE_STONE_FLESH (SND_NULL); -const LLUUID SND_SLIDE_STONE_GLASS (SND_NULL); -const LLUUID SND_SLIDE_STONE_METAL (SND_NULL); -const LLUUID SND_SLIDE_STONE_PLASTIC ("afd0bcc3-d41a-4572-9e7f-08a29eeb0b8a"); -const LLUUID SND_SLIDE_STONE_PLASTIC_02 ("881b720a-96cf-4128-bb98-5d87e03e93c7"); -const LLUUID SND_SLIDE_STONE_PLASTIC_03 ("293dac42-658a-4c5a-a7a2-6d4c5e5658b0"); -const LLUUID SND_SLIDE_STONE_RUBBER ("0724b946-6a3f-4eeb-bb50-0a3b33120974"); -const LLUUID SND_SLIDE_STONE_RUBBER_02 ("ada93d00-76e2-4bf1-9ad9-493727630717"); -const LLUUID SND_SLIDE_STONE_STONE ("ade766dc-2e75-4699-9b41-7c8e53d2b3f2"); -const LLUUID SND_SLIDE_STONE_STONE_02 ("66698375-6594-47b0-8046-c3973de1291d"); -const LLUUID SND_SLIDE_STONE_WOOD ("174ef324-ed50-4f65-9479-b4da580aeb3c"); -const LLUUID SND_SLIDE_STONE_WOOD_02 ("33d517fd-ff11-4d01-a7b5-0e3abf818dcf"); -const LLUUID SND_SLIDE_STONE_WOOD_03 ("1bac4b63-e6fd-4659-9761-991284cf4582"); -const LLUUID SND_SLIDE_STONE_WOOD_04 ("a7d28564-6821-4c01-a378-cde98fba7ba9"); -const LLUUID SND_SLIDE_WOOD_FABRIC ("22c58e74-22cd-4960-9ab7-5bf08ab824e5"); -const LLUUID SND_SLIDE_WOOD_FABRIC_02 ("0b0ed22e-4a0f-4617-a4cf-20d0f2b78ccc"); -const LLUUID SND_SLIDE_WOOD_FABRIC_03 ("42b80abb-9823-4b74-a210-326ccf23636a"); -const LLUUID SND_SLIDE_WOOD_FABRIC_04 ("8538298a-1e6b-4b69-a9ee-5e01e4a02b35"); -const LLUUID SND_SLIDE_WOOD_FLESH ("84b026f3-a11c-4366-aa7c-07edcd89b2bb"); -const LLUUID SND_SLIDE_WOOD_FLESH_02 ("2644191f-4848-47ba-8ba7-bddc0bfcb3da"); -const LLUUID SND_SLIDE_WOOD_FLESH_03 ("edb978e4-9be9-456f-b2fc-e8502bfe25be"); -const LLUUID SND_SLIDE_WOOD_FLESH_04 ("bf2b972e-f42a-46d7-b53e-5fca38f5bc61"); -const LLUUID SND_SLIDE_WOOD_GRAVEL ("d063bb4d-0eff-4403-a6cc-c6c6c073e624"); -const LLUUID SND_SLIDE_WOOD_GRAVEL_02 ("511eb679-6d93-47fa-9141-c3ef9261c919"); -const LLUUID SND_SLIDE_WOOD_GRAVEL_03 ("4ed1fd43-4707-4e5c-b7b7-21ec4e72c1ac"); -const LLUUID SND_SLIDE_WOOD_GRAVEL_04 ("99ea89b3-aa76-4b87-99c8-670365c6d8c3"); -const LLUUID SND_SLIDE_WOOD_PLASTIC ("505ca3c4-94a0-4e28-8fc1-ea72a428396b"); -const LLUUID SND_SLIDE_WOOD_PLASTIC_02 ("fc404011-df71-4ed0-8f22-b72bdd18f63c"); -const LLUUID SND_SLIDE_WOOD_PLASTIC_03 ("67dbe225-26df-4efa-8c8b-f1ef669fec45"); -const LLUUID SND_SLIDE_WOOD_RUBBER (SND_NULL); -const LLUUID SND_SLIDE_WOOD_WOOD ("3079d569-b3e8-4df4-9e09-f0d4611213ef"); -const LLUUID SND_SLIDE_WOOD_WOOD_02 ("276b093d-dbcb-4279-a89e-a54b0b416af6"); -const LLUUID SND_SLIDE_WOOD_WOOD_03 ("c3f3ca5e-2768-4081-847f-247139310fdb"); -const LLUUID SND_SLIDE_WOOD_WOOD_04 ("f08d44b8-ff87-4a98-9561-c72f1f2fec81"); -const LLUUID SND_SLIDE_WOOD_WOOD_05 ("2d8a58cf-f139-4238-8503-27d334d05c85"); -const LLUUID SND_SLIDE_WOOD_WOOD_06 ("e157ebbd-b12d-4225-aa7c-d47b026a7687"); -const LLUUID SND_SLIDE_WOOD_WOOD_07 ("35e17956-e7b4-478c-b274-e37db8a166b2"); -const LLUUID SND_SLIDE_WOOD_WOOD_08 ("e606fc65-0643-4964-9979-ff964fa6a62c"); +extern LLUUID const SND_ROLL_FLESH_FLESH; +extern LLUUID const SND_ROLL_FLESH_PLASTIC; +extern LLUUID const SND_ROLL_FLESH_PLASTIC_02; +extern LLUUID const SND_ROLL_FLESH_RUBBER; +extern LLUUID const SND_ROLL_GLASS_GRAVEL; +extern LLUUID const SND_ROLL_GLASS_GRAVEL_02; +extern LLUUID const SND_ROLL_GLASS_FLESH; +extern LLUUID const SND_ROLL_GLASS_GLASS; +extern LLUUID const SND_ROLL_GLASS_PLASTIC; +extern LLUUID const SND_ROLL_GLASS_RUBBER; +extern LLUUID const SND_ROLL_GLASS_WOOD; +extern LLUUID const SND_ROLL_GLASS_WOOD_02; +extern LLUUID const SND_ROLL_GRAVEL_GRAVEL; +extern LLUUID const SND_ROLL_GRAVEL_GRAVEL_02; +extern LLUUID const SND_ROLL_METAL_FABRIC; +extern LLUUID const SND_ROLL_METAL_FABRIC_02; +extern LLUUID const SND_ROLL_METAL_FLESH; +extern LLUUID const SND_ROLL_METAL_GLASS; +extern LLUUID const SND_ROLL_METAL_GLASS_02; +extern LLUUID const SND_ROLL_METAL_GLASS_03; +extern LLUUID const SND_ROLL_METAL_GRAVEL; +extern LLUUID const SND_ROLL_METAL_METAL; +extern LLUUID const SND_ROLL_METAL_METAL_02; +extern LLUUID const SND_ROLL_METAL_METAL_03; +extern LLUUID const SND_ROLL_METAL_METAL_04; +extern LLUUID const SND_ROLL_METAL_PLASTIC; +extern LLUUID const SND_ROLL_METAL_PLASTIC_01; +extern LLUUID const SND_ROLL_METAL_RUBBER; +extern LLUUID const SND_ROLL_METAL_WOOD; +extern LLUUID const SND_ROLL_METAL_WOOD_02; +extern LLUUID const SND_ROLL_METAL_WOOD_03; +extern LLUUID const SND_ROLL_METAL_WOOD_04; +extern LLUUID const SND_ROLL_METAL_WOOD_05; +extern LLUUID const SND_ROLL_PLASTIC_FABRIC; +extern LLUUID const SND_ROLL_PLASTIC_PLASTIC; +extern LLUUID const SND_ROLL_PLASTIC_PLASTIC_02; +extern LLUUID const SND_ROLL_RUBBER_PLASTIC; +extern LLUUID const SND_ROLL_RUBBER_RUBBER; +extern LLUUID const SND_ROLL_STONE_FLESH; +extern LLUUID const SND_ROLL_STONE_GLASS; +extern LLUUID const SND_ROLL_STONE_METAL; +extern LLUUID const SND_ROLL_STONE_PLASTIC; +extern LLUUID const SND_ROLL_STONE_RUBBER; +extern LLUUID const SND_ROLL_STONE_STONE; +extern LLUUID const SND_ROLL_STONE_STONE_02; +extern LLUUID const SND_ROLL_STONE_STONE_03; +extern LLUUID const SND_ROLL_STONE_STONE_04; +extern LLUUID const SND_ROLL_STONE_STONE_05; +extern LLUUID const SND_ROLL_STONE_WOOD; +extern LLUUID const SND_ROLL_STONE_WOOD_02; +extern LLUUID const SND_ROLL_STONE_WOOD_03; +extern LLUUID const SND_ROLL_STONE_WOOD_04; +extern LLUUID const SND_ROLL_WOOD_FLESH; +extern LLUUID const SND_ROLL_WOOD_FLESH_02; +extern LLUUID const SND_ROLL_WOOD_FLESH_03; +extern LLUUID const SND_ROLL_WOOD_FLESH_04; +extern LLUUID const SND_ROLL_WOOD_GRAVEL; +extern LLUUID const SND_ROLL_WOOD_GRAVEL_02; +extern LLUUID const SND_ROLL_WOOD_GRAVEL_03; +extern LLUUID const SND_ROLL_WOOD_PLASTIC; +extern LLUUID const SND_ROLL_WOOD_PLASTIC_02; +extern LLUUID const SND_ROLL_WOOD_RUBBER; +extern LLUUID const SND_ROLL_WOOD_WOOD; +extern LLUUID const SND_ROLL_WOOD_WOOD_02; +extern LLUUID const SND_ROLL_WOOD_WOOD_03; +extern LLUUID const SND_ROLL_WOOD_WOOD_04; +extern LLUUID const SND_ROLL_WOOD_WOOD_05; +extern LLUUID const SND_ROLL_WOOD_WOOD_06; +extern LLUUID const SND_ROLL_WOOD_WOOD_07; +extern LLUUID const SND_ROLL_WOOD_WOOD_08; +extern LLUUID const SND_ROLL_WOOD_WOOD_09; -const LLUUID SND_ROLL_FLESH_FLESH (SND_NULL); -const LLUUID SND_ROLL_FLESH_PLASTIC ("89a0be4c-848d-4a6e-8886-298f56c2cff4"); -const LLUUID SND_ROLL_FLESH_PLASTIC_02 ("beb06343-1aa1-4af2-b320-5d2ec31c53b1"); -const LLUUID SND_ROLL_FLESH_RUBBER (SND_NULL); -const LLUUID SND_ROLL_GLASS_GRAVEL ("ba795c74-7e09-4572-b495-e09886a46b86"); -const LLUUID SND_ROLL_GLASS_GRAVEL_02 ("4c93c3b7-14cb-4d9b-a7df-628ad935f1f2"); -const LLUUID SND_ROLL_GLASS_FLESH (SND_NULL); -const LLUUID SND_ROLL_GLASS_GLASS (SND_NULL); -const LLUUID SND_ROLL_GLASS_PLASTIC (SND_NULL); -const LLUUID SND_ROLL_GLASS_RUBBER (SND_NULL); -const LLUUID SND_ROLL_GLASS_WOOD ("d40b1f48-a061-4f6e-b18f-4326a3dd5c29"); -const LLUUID SND_ROLL_GLASS_WOOD_02 ("78cd407a-bb36-4163-ba09-20f2e6d9d44b"); -const LLUUID SND_ROLL_GRAVEL_GRAVEL ("c7354cc3-6df5-4738-8dbb-b28a6ac46a05"); -const LLUUID SND_ROLL_GRAVEL_GRAVEL_02 ("01d194c4-72a6-47df-81a5-8db430faff87"); -const LLUUID SND_ROLL_METAL_FABRIC ("ce6e6564-20fd-48e4-81e2-cd3f81c00a3e"); -const LLUUID SND_ROLL_METAL_FABRIC_02 ("fc4d0065-32f6-4bb0-9f3f-f4737eb27163"); -const LLUUID SND_ROLL_METAL_FLESH (SND_NULL); -const LLUUID SND_ROLL_METAL_GLASS ("63d530bb-a41f-402b-aa1f-be6b11959809"); -const LLUUID SND_ROLL_METAL_GLASS_02 ("f62642c2-6db5-4faa-8b77-939067d837c3"); -const LLUUID SND_ROLL_METAL_GLASS_03 ("db5b5a15-2817-4cd7-9f0b-9ad49b5e52c8"); -const LLUUID SND_ROLL_METAL_GRAVEL ("447164e3-9646-4c1a-a16d-606892891466"); -const LLUUID SND_ROLL_METAL_METAL ("c3c22cf3-5d1f-4cc3-b4b5-708b9f65979c"); -const LLUUID SND_ROLL_METAL_METAL_02 ("d8386277-a1ea-460e-b6fd-bb285c323bf1"); -const LLUUID SND_ROLL_METAL_METAL_03 ("69ee1f02-f9cd-4c8b-aedd-39a2d6705680"); -const LLUUID SND_ROLL_METAL_METAL_04 ("5cc6b5fd-26ce-47ad-b21d-3a7c190dd375"); -const LLUUID SND_ROLL_METAL_PLASTIC ("c6a9bbf6-df15-4713-9f84-7237fce4051e"); -const LLUUID SND_ROLL_METAL_PLASTIC_01 ("0fedb59b-2dbb-4cec-b6cc-8559ec027749"); -const LLUUID SND_ROLL_METAL_RUBBER (SND_NULL); -const LLUUID SND_ROLL_METAL_WOOD ("1d76af57-01b1-4c73-9a1d-69523bfa50ea"); -const LLUUID SND_ROLL_METAL_WOOD_02 ("78aa4e71-8e7c-4b90-a561-3ebdc639f99b"); -const LLUUID SND_ROLL_METAL_WOOD_03 ("777d95bf-962f-48fa-93bf-8c1806557d72"); -const LLUUID SND_ROLL_METAL_WOOD_04 ("1833da76-45e2-4a8b-97da-d17413e056c9"); -const LLUUID SND_ROLL_METAL_WOOD_05 ("b13e1232-3d8d-42e9-92ec-b30f9f823962"); -const LLUUID SND_ROLL_PLASTIC_FABRIC ("616a1f03-209f-4c55-b264-83a000b6ef0a"); -const LLUUID SND_ROLL_PLASTIC_PLASTIC ("873f3d82-00b2-4082-9c69-7aef3461dba1"); -const LLUUID SND_ROLL_PLASTIC_PLASTIC_02 ("cc39879f-ebc8-4405-a4fc-8342f5bed31e"); -const LLUUID SND_ROLL_RUBBER_PLASTIC (SND_NULL); -const LLUUID SND_ROLL_RUBBER_RUBBER (SND_NULL); -const LLUUID SND_ROLL_STONE_FLESH (SND_NULL); -const LLUUID SND_ROLL_STONE_GLASS (SND_NULL); -const LLUUID SND_ROLL_STONE_METAL (SND_NULL); -const LLUUID SND_ROLL_STONE_PLASTIC ("155f65a8-cae7-476e-a58b-fd362be7fd0e"); -const LLUUID SND_ROLL_STONE_RUBBER (SND_NULL); -const LLUUID SND_ROLL_STONE_STONE ("67d56e3f-6ed5-4658-9418-14f020c38b11"); -const LLUUID SND_ROLL_STONE_STONE_02 ("43d99d10-d75b-4246-accf-4ceb2c909aa7"); -const LLUUID SND_ROLL_STONE_STONE_03 ("f04e83ff-eed7-4e99-8f45-eb97e4e1d3b7"); -const LLUUID SND_ROLL_STONE_STONE_04 ("10fcc5ad-fa89-48d6-b774-986b580c1efc"); -const LLUUID SND_ROLL_STONE_STONE_05 ("3d86f5a3-1a91-49d9-b99f-8521a7422497"); -const LLUUID SND_ROLL_STONE_WOOD ("53e46fb7-6c21-4fe1-bffe-0567475d48fa"); -const LLUUID SND_ROLL_STONE_WOOD_02 ("5eba8c9a-a014-4299-87f1-315c45ec795b"); -const LLUUID SND_ROLL_STONE_WOOD_03 ("ea6c05fc-6e9c-4526-8a20-bc47810bb549"); -const LLUUID SND_ROLL_STONE_WOOD_04 ("64618cbf-3f42-4728-8094-e77807545efb"); -const LLUUID SND_ROLL_WOOD_FLESH ("26ee185d-6fc3-49f8-89ba-51cab04cfc42"); -const LLUUID SND_ROLL_WOOD_FLESH_02 ("334faa25-1e80-4c99-b29f-4c9c2a3d079d"); -const LLUUID SND_ROLL_WOOD_FLESH_03 ("2f876626-4dce-4f71-a91e-a25302edfab7"); -const LLUUID SND_ROLL_WOOD_FLESH_04 ("d6877aac-07fc-4931-bcde-585f223802ad"); -const LLUUID SND_ROLL_WOOD_GRAVEL ("2a23ebb5-a4a2-4f1f-8d75-7384239354aa"); -const LLUUID SND_ROLL_WOOD_GRAVEL_02 ("208bf26d-f097-450c-95c4-9d26317c613c"); -const LLUUID SND_ROLL_WOOD_GRAVEL_03 ("a26ecaf4-92c6-4e32-9864-56b7c70cab8e"); -const LLUUID SND_ROLL_WOOD_PLASTIC ("71c1000a-9f16-4cc3-8ede-ec4aa3bf5723"); -const LLUUID SND_ROLL_WOOD_PLASTIC_02 ("7bc20ba6-1e6d-4eea-83ad-c5cc3ae0e409"); -const LLUUID SND_ROLL_WOOD_RUBBER (SND_NULL); -const LLUUID SND_ROLL_WOOD_WOOD ("2cc8eec4-bb4a-4ba8-b783-71526ec708e8"); -const LLUUID SND_ROLL_WOOD_WOOD_02 ("0a1f8070-a11a-4b4c-b260-5ffb6acb0a5d"); -const LLUUID SND_ROLL_WOOD_WOOD_03 ("160bef64-da9c-4be8-b07b-a5060b501700"); -const LLUUID SND_ROLL_WOOD_WOOD_04 ("1c62ea16-cc60-48ed-829a-68b8f4cf0c1c"); -const LLUUID SND_ROLL_WOOD_WOOD_05 ("be9cc8fe-b920-4bf5-8924-453088cbc03f"); -const LLUUID SND_ROLL_WOOD_WOOD_06 ("a76cfe60-56b0-43b1-8f31-93e56947d78b"); -const LLUUID SND_ROLL_WOOD_WOOD_07 ("0c6aa481-b5bc-4573-ae83-8e16ff27e750"); -const LLUUID SND_ROLL_WOOD_WOOD_08 ("214ab2c7-871a-451b-b0db-4c5677199011"); -const LLUUID SND_ROLL_WOOD_WOOD_09 ("0086e4db-3ac6-4545-b414-6f359bedd9a5"); +extern LLUUID const SND_SLIDE_STONE_STONE_01; -const LLUUID SND_SLIDE_STONE_STONE_01 ("2a7dcbd1-d3e6-4767-8432-8322648e7b9d"); +extern LLUUID const SND_STONE_DIRT_01; +extern LLUUID const SND_STONE_DIRT_02; +extern LLUUID const SND_STONE_DIRT_03; +extern LLUUID const SND_STONE_DIRT_04; -const LLUUID SND_STONE_DIRT_01 ("97727335-392c-4338-ac4b-23a7883279c2"); -const LLUUID SND_STONE_DIRT_02 ("cbe75eb2-3375-41d8-9e3f-2ae46b4164ed"); -const LLUUID SND_STONE_DIRT_03 ("31e236ee-001b-4c8e-ad6c-c2074cb64357"); -const LLUUID SND_STONE_DIRT_04 ("c8091652-e04b-4a11-84ba-15dba06e7a1b"); - -const LLUUID SND_STONE_STONE_02 ("ba4ef5ac-7435-4240-b826-c24ba8fa5a78"); -const LLUUID SND_STONE_STONE_04 ("ea296329-0f09-4993-af1b-e6784bab1dc9"); - - - -// extra guids -#if 0 -const LLUUID SND_ ("a839b8ac-b0af-4ba9-9fde-188754744e02"); -const LLUUID SND_ ("20165fa8-836f-4993-85dc-1529172dcd14"); -const LLUUID SND_ ("fba8e17b-a4b3-4693-9fce-c14800f8a349"); -const LLUUID SND_ ("2d48db8b-7260-4b02-ad2a-b2c6bee60e94"); -const LLUUID SND_ ("956d344b-1808-4d8b-88b1-cbc82b7a96a1"); -const LLUUID SND_ ("b8303cc6-f0b4-4c6f-a199-81f87aba342e"); -const LLUUID SND_ ("fbf7cd0c-bc8f-4cba-9c19-11f4dd03a06b"); -const LLUUID SND_ ("85047f7d-933a-4ce5-a7b5-34670243e1ab"); -const LLUUID SND_ ("0f81acf7-6a2e-4490-957f-c7b0eda00559"); -const LLUUID SND_ ("5631a6a1-79b4-4de8-bccf-1880b6882da1"); -const LLUUID SND_ ("43c87a6b-ffb2-437b-89a0-9deba890a4fc"); -const LLUUID SND_ ("58878d1d-3156-4d01-ac3c-0c4fb99f4d53"); -const LLUUID SND_ ("9a83f321-44bf-40f6-b006-46c085515345"); -const LLUUID SND_ ("ff144533-33ab-40f2-bac8-39c34699ecc4"); -const LLUUID SND_ ("09018e87-d52c-4cd5-9805-015f413319e7"); -const LLUUID SND_ ("17d4c057-7edd-401e-9589-d5b9fe981bf2"); -#endif +extern LLUUID const SND_STONE_STONE_02; +extern LLUUID const SND_STONE_STONE_04; #endif 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 @@ LLMaterialTable LLMaterialTable::basic(1); +// Material UUIDs. +LLUUID const LL_DEFAULT_STONE_UUID("87c5765b-aa26-43eb-b8c6-c09a1ca6208e"); +LLUUID const LL_DEFAULT_METAL_UUID("6f3c53e9-ba60-4010-8f3e-30f51a762476"); +LLUUID const LL_DEFAULT_GLASS_UUID("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d"); +LLUUID const LL_DEFAULT_WOOD_UUID("89556747-24cb-43ed-920b-47caed15465f"); +LLUUID const LL_DEFAULT_FLESH_UUID("80736669-e4b9-450e-8890-d5169f988a50"); +LLUUID const LL_DEFAULT_PLASTIC_UUID("304fcb4e-7d33-4339-ba80-76d3d22dc11a"); +LLUUID const LL_DEFAULT_RUBBER_UUID("9fae0bc5-666d-477e-9f70-84e8556ec867"); +LLUUID const LL_DEFAULT_LIGHT_UUID("00000000-0000-0000-0000-000000000000"); + /* Old Havok 1 constants diff --git a/linden/indra/llprimitive/material_codes.h b/linden/indra/llprimitive/material_codes.h index e5a59a2..ed159bc 100644 --- a/linden/indra/llprimitive/material_codes.h +++ b/linden/indra/llprimitive/material_codes.h @@ -47,13 +47,13 @@ const U8 LL_MCODE_LIGHT = 7; const U8 LL_MCODE_END = 8; const U8 LL_MCODE_MASK = 0x0F; -const LLUUID LL_DEFAULT_STONE_UUID("87c5765b-aa26-43eb-b8c6-c09a1ca6208e"); -const LLUUID LL_DEFAULT_METAL_UUID("6f3c53e9-ba60-4010-8f3e-30f51a762476"); -const LLUUID LL_DEFAULT_GLASS_UUID("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d"); -const LLUUID LL_DEFAULT_WOOD_UUID("89556747-24cb-43ed-920b-47caed15465f"); -const LLUUID LL_DEFAULT_FLESH_UUID("80736669-e4b9-450e-8890-d5169f988a50"); -const LLUUID LL_DEFAULT_PLASTIC_UUID("304fcb4e-7d33-4339-ba80-76d3d22dc11a"); -const LLUUID LL_DEFAULT_RUBBER_UUID("9fae0bc5-666d-477e-9f70-84e8556ec867"); -const LLUUID LL_DEFAULT_LIGHT_UUID("00000000-0000-0000-0000-000000000000"); +extern LLUUID const LL_DEFAULT_STONE_UUID; +extern LLUUID const LL_DEFAULT_METAL_UUID; +extern LLUUID const LL_DEFAULT_GLASS_UUID; +extern LLUUID const LL_DEFAULT_WOOD_UUID; +extern LLUUID const LL_DEFAULT_FLESH_UUID; +extern LLUUID const LL_DEFAULT_PLASTIC_UUID; +extern LLUUID const LL_DEFAULT_RUBBER_UUID; +extern LLUUID const LL_DEFAULT_LIGHT_UUID; #endif diff --git a/linden/indra/llui/lluixmltags.h b/linden/indra/llui/lluixmltags.h index 4166131..6bbb788 100644 --- a/linden/indra/llui/lluixmltags.h +++ b/linden/indra/llui/lluixmltags.h @@ -32,100 +32,100 @@ #ifndef LL_UI_XML_TAGS_H #define LL_UI_XML_TAGS_H -const std::string - LL_BUTTON_TAG("button"), - LL_UI_CTRL_LOCATE_TAG("locate"), - LL_PAD_TAG("pad"), - LL_CHECK_BOX_CTRL_TAG("check_box"), - LL_COMBO_BOX_TAG("combo_box"), - LL_DRAG_HANDLE_TOP_TAG("drag_handle_top"), - LL_DRAG_HANDLE_LEFT_TAG("drag_handle_left"), - LL_FLOATER_TAG("floater"), - LL_FLOATER_VIEW_TAG("floater_view"), - LL_MULTI_FLOATER_TAG("multi_floater"), - LL_ICON_CTRL_TAG("icon"), - LL_LINE_EDITOR_TAG("line_editor"), - LL_SEARCH_EDITOR_TAG("search_editor"), - LL_MENU_ITEM_TAG("menu_item"), - LL_MENU_GL_TAG("menu"), - LL_MENU_BAR_GL_TAG("menu_bar"), - LL_MENU_HOLDER_GL_TAG("menu_holder"), - LL_PANEL_TAG("panel"), - LL_RADIO_GROUP_TAG("radio_group"), - LL_RESIZE_BAR_TAG("resize_bar"), - LL_RESIZE_HANDLE_TAG("resize_handle"), - LL_SCROLLBAR_TAG("scrollbar"), - LL_SCROLLABLE_CONTAINER_VIEW_TAG("scroll_container"), - LL_SCROLL_LIST_CTRL_TAG("scroll_list"), - LL_SLIDER_CTRL_TAG("slider"), - LL_SLIDER_TAG("slider_bar"), - LL_MULTI_SLIDER_CTRL_TAG("multi_slider"), - LL_MULTI_SLIDER_TAG("multi_slider_bar"), - LL_SPIN_CTRL_TAG("spinner"), - LL_TAB_CONTAINER_COMMON_TAG("tab_container"), - LL_TEXT_BOX_TAG("text"), - LL_TEXT_EDITOR_TAG("text_editor"), - LL_VIEW_BORDER_TAG("view_border"), - LL_COLOR_SWATCH_TAG("color_swatch"), - LL_INVENTORY_PANEL_TAG("inventory_panel"), - LL_NAME_EDITOR_TAG("name_editor"), - LL_NAME_LIST_TAG("name_list"), - LL_TEXTURE_PICKER_TAG("texture_picker"), - LL_VOLUME_SLIDER_CTRL_TAG("volume_slider"), - LL_WEB_BROWSER_CTRL_TAG("web_browser"), - LL_STAT_VIEW_TAG("stat_view"), - LL_PROGRESS_VIEW_TAG("progress_view"), - LL_STAT_BAR_TAG("stat_bar"), - LL_STATUS_BAR_TAG("status_bar"), - LL_VIEWER_TEXT_EDITOR_TAG("viewer_text_editor"), - LL_TALK_VIEW_TAG("talk_view"), - LL_COLOR_SWATCH_CTRL_TAG("color_swatch"), - LL_GL_TEX_MEM_BAR_TAG("tex_mem_bar"), - LL_TEXTURE_CTRL_TAG("texture_picker"), - LL_TEXTURE_VIEW_TAG("texture_view"), - LL_NAME_LIST_CTRL_TAG("name_list"), - LL_STAT_GRAPH_TAG("stat_graph"), - LL_DROP_TARGET_TAG("drop_target"), - LL_OVERLAY_BAR_TAG("overlay_bar"), - LL_NET_MAP_TAG("net_map"), - LL_HUD_VIEW_TAG("hud_view"), - LL_MEMORY_VIEW_TAG("memory_view"), - LL_MEDIA_REMOTE_CTRL_TAG("media_remote"), - LL_MORPH_VIEW_TAG("morph_view"), - LL_FRAME_STAT_VIEW_TAG("frame_stat_view"), - LL_FOLDER_VIEW_TAG("folder_view"), - LL_SNAPSHOT_LIVE_PREVIEW_TAG("snapshot_preview"), - LL_HOVER_VIEW_TAG("hover_view"), - LL_VELOCITY_BAR_TAG("velocity_bar"), - LL_PERMISSIONS_VIEW_TAG("permissions_view"), - LL_SCROLLING_PANEL_LIST_TAG("scrolling_panel_list"), - LL_CONTAINER_VIEW_TAG("container_view"), - LL_CONSOLE_TAG("console"), - LL_DEBUG_VIEW_TAG("debug_view"), - LL_AUDIOSTATUS_TAG("audio_status"), - LL_FAST_TIMER_VIEW_TAG("fast_timer_view"), - LL_MENU_ITEM_TEAR_OFF_GL_TAG("tearoff_menu"), - LL_MENU_ITEM_BLANK_GL_TAG("menu_item_blank"), - LL_MENU_ITEM_CALL_GL_TAG("menu_item_call"), - LL_MENU_ITEM_CHECK_GL_TAG("menu_item_check"), - LL_MENU_ITEM_BRANCH_GL_TAG("menu_item_branch"), - LL_MENU_ITEM_BRANCH_DOWN_GL_TAG("menu_item_branch_down"), - LL_PIE_MENU_BRANCH_TAG("pie_menu_branch"), - LL_PIE_MENU_TAG("pie_menu"), - LL_MENU_ITEM_SEPARATOR_GL_TAG("menu_item_separator"), - LL_MENU_ITEM_VERTICAL_SEPARATOR_GL_TAG("menu_item_vertical_separator"), - LL_ROOT_VIEW_TAG("root_view"), - LL_FOLDER_VIEW_ITEM_TAG("folder_item"), - LL_FOLDER_VIEW_FOLDER_TAG("folder"), - LL_TEXTURE_BAR_TAG("texture_bar"), - LL_JOYSTICK_SLIDE("joystick_slide"), - LL_JOYSTICK_TURN("joystick_turn"), - LL_GROUP_DROP_TARGET_TAG("group_drop_target"), - LL_LAYOUT_STACK_TAG("layout_stack"), - LL_LAYOUT_PANEL_TAG("layout_panel"), - LL_FLYOUT_BUTTON_TAG("flyout_button"), - LL_FLYOUT_BUTTON_ITEM_TAG("flyout_button_item"), - LL_SIMPLE_TEXT_EDITOR_TAG("simple_text_editor"), - LL_RADIO_ITEM_TAG("radio_item"), - LL_PROGRESS_BAR_TAG("progress_bar"); +char const* const LL_BUTTON_TAG = "button"; +char const* const LL_UI_CTRL_LOCATE_TAG = "locate"; +char const* const LL_PAD_TAG = "pad"; +char const* const LL_CHECK_BOX_CTRL_TAG = "check_box"; +char const* const LL_COMBO_BOX_TAG = "combo_box"; +char const* const LL_DRAG_HANDLE_TOP_TAG = "drag_handle_top"; +char const* const LL_DRAG_HANDLE_LEFT_TAG = "drag_handle_left"; +char const* const LL_FLOATER_TAG = "floater"; +char const* const LL_FLOATER_VIEW_TAG = "floater_view"; +char const* const LL_MULTI_FLOATER_TAG = "multi_floater"; +char const* const LL_ICON_CTRL_TAG = "icon"; +char const* const LL_LINE_EDITOR_TAG = "line_editor"; +char const* const LL_SEARCH_EDITOR_TAG = "search_editor"; +char const* const LL_MENU_ITEM_TAG = "menu_item"; +char const* const LL_MENU_GL_TAG = "menu"; +char const* const LL_MENU_BAR_GL_TAG = "menu_bar"; +char const* const LL_MENU_HOLDER_GL_TAG = "menu_holder"; +char const* const LL_PANEL_TAG = "panel"; +char const* const LL_RADIO_GROUP_TAG = "radio_group"; +char const* const LL_RESIZE_BAR_TAG = "resize_bar"; +char const* const LL_RESIZE_HANDLE_TAG = "resize_handle"; +char const* const LL_SCROLLBAR_TAG = "scrollbar"; +char const* const LL_SCROLLABLE_CONTAINER_VIEW_TAG = "scroll_container"; +char const* const LL_SCROLL_LIST_CTRL_TAG = "scroll_list"; +char const* const LL_SLIDER_CTRL_TAG = "slider"; +char const* const LL_SLIDER_TAG = "slider_bar"; +char const* const LL_MULTI_SLIDER_CTRL_TAG = "multi_slider"; +char const* const LL_MULTI_SLIDER_TAG = "multi_slider_bar"; +char const* const LL_SPIN_CTRL_TAG = "spinner"; +char const* const LL_TAB_CONTAINER_COMMON_TAG = "tab_container"; +char const* const LL_TEXT_BOX_TAG = "text"; +char const* const LL_TEXT_EDITOR_TAG = "text_editor"; +char const* const LL_VIEW_BORDER_TAG = "view_border"; +char const* const LL_COLOR_SWATCH_TAG = "color_swatch"; +char const* const LL_INVENTORY_PANEL_TAG = "inventory_panel"; +char const* const LL_NAME_EDITOR_TAG = "name_editor"; +char const* const LL_NAME_LIST_TAG = "name_list"; +char const* const LL_TEXTURE_PICKER_TAG = "texture_picker"; +char const* const LL_VOLUME_SLIDER_CTRL_TAG = "volume_slider"; +char const* const LL_WEB_BROWSER_CTRL_TAG = "web_browser"; +char const* const LL_STAT_VIEW_TAG = "stat_view"; +char const* const LL_PROGRESS_VIEW_TAG = "progress_view"; +char const* const LL_STAT_BAR_TAG = "stat_bar"; +char const* const LL_STATUS_BAR_TAG = "status_bar"; +char const* const LL_VIEWER_TEXT_EDITOR_TAG = "viewer_text_editor"; +char const* const LL_TALK_VIEW_TAG = "talk_view"; +char const* const LL_COLOR_SWATCH_CTRL_TAG = "color_swatch"; +char const* const LL_GL_TEX_MEM_BAR_TAG = "tex_mem_bar"; +char const* const LL_TEXTURE_CTRL_TAG = "texture_picker"; +char const* const LL_TEXTURE_VIEW_TAG = "texture_view"; +char const* const LL_NAME_LIST_CTRL_TAG = "name_list"; +char const* const LL_STAT_GRAPH_TAG = "stat_graph"; +char const* const LL_DROP_TARGET_TAG = "drop_target"; +char const* const LL_OVERLAY_BAR_TAG = "overlay_bar"; +char const* const LL_NET_MAP_TAG = "net_map"; +char const* const LL_HUD_VIEW_TAG = "hud_view"; +char const* const LL_MEMORY_VIEW_TAG = "memory_view"; +char const* const LL_MEDIA_REMOTE_CTRL_TAG = "media_remote"; +char const* const LL_MORPH_VIEW_TAG = "morph_view"; +char const* const LL_FRAME_STAT_VIEW_TAG = "frame_stat_view"; +char const* const LL_FOLDER_VIEW_TAG = "folder_view"; +char const* const LL_SNAPSHOT_LIVE_PREVIEW_TAG = "snapshot_preview"; +char const* const LL_HOVER_VIEW_TAG = "hover_view"; +char const* const LL_VELOCITY_BAR_TAG = "velocity_bar"; +char const* const LL_PERMISSIONS_VIEW_TAG = "permissions_view"; +char const* const LL_SCROLLING_PANEL_LIST_TAG = "scrolling_panel_list"; +char const* const LL_CONTAINER_VIEW_TAG = "container_view"; +char const* const LL_CONSOLE_TAG = "console"; +char const* const LL_DEBUG_VIEW_TAG = "debug_view"; +char const* const LL_AUDIOSTATUS_TAG = "audio_status"; +char const* const LL_FAST_TIMER_VIEW_TAG = "fast_timer_view"; +char const* const LL_MENU_ITEM_TEAR_OFF_GL_TAG = "tearoff_menu"; +char const* const LL_MENU_ITEM_BLANK_GL_TAG = "menu_item_blank"; +char const* const LL_MENU_ITEM_CALL_GL_TAG = "menu_item_call"; +char const* const LL_MENU_ITEM_CHECK_GL_TAG = "menu_item_check"; +char const* const LL_MENU_ITEM_BRANCH_GL_TAG = "menu_item_branch"; +char const* const LL_MENU_ITEM_BRANCH_DOWN_GL_TAG = "menu_item_branch_down"; +char const* const LL_PIE_MENU_BRANCH_TAG = "pie_menu_branch"; +char const* const LL_PIE_MENU_TAG = "pie_menu"; +char const* const LL_MENU_ITEM_SEPARATOR_GL_TAG = "menu_item_separator"; +char const* const LL_MENU_ITEM_VERTICAL_SEPARATOR_GL_TAG = "menu_item_vertical_separator"; +char const* const LL_ROOT_VIEW_TAG = "root_view"; +char const* const LL_FOLDER_VIEW_ITEM_TAG = "folder_item"; +char const* const LL_FOLDER_VIEW_FOLDER_TAG = "folder"; +char const* const LL_TEXTURE_BAR_TAG = "texture_bar"; +char const* const LL_JOYSTICK_SLIDE = "joystick_slide"; +char const* const LL_JOYSTICK_TURN = "joystick_turn"; +char const* const LL_GROUP_DROP_TARGET_TAG = "group_drop_target"; +char const* const LL_LAYOUT_STACK_TAG = "layout_stack"; +char const* const LL_LAYOUT_PANEL_TAG = "layout_panel"; +char const* const LL_FLYOUT_BUTTON_TAG = "flyout_button"; +char const* const LL_FLYOUT_BUTTON_ITEM_TAG = "flyout_button_item"; +char const* const LL_SIMPLE_TEXT_EDITOR_TAG = "simple_text_editor"; +char const* const LL_RADIO_ITEM_TAG = "radio_item"; +char const* const LL_PROGRESS_BAR_TAG = "progress_bar"; + #endif diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index c8b26be..2c42a27 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp @@ -684,16 +684,16 @@ S32 LLVOAvatar::sNumVisibleAvatars = 0; S32 LLVOAvatar::sNumLODChangesThisFrame = 0; LLSD LLVOAvatar::sClientResolutionList; -const LLUUID LLVOAvatar::sStepSoundOnLand = LLUUID("e8af4a28-aa83-4310-a7c4-c047e15ea0df"); +const LLUUID LLVOAvatar::sStepSoundOnLand("e8af4a28-aa83-4310-a7c4-c047e15ea0df"); const LLUUID LLVOAvatar::sStepSounds[LL_MCODE_END] = { - LLUUID(SND_STONE_RUBBER), - LLUUID(SND_METAL_RUBBER), - LLUUID(SND_GLASS_RUBBER), - LLUUID(SND_WOOD_RUBBER), - LLUUID(SND_FLESH_RUBBER), - LLUUID(SND_RUBBER_PLASTIC), - LLUUID(SND_RUBBER_RUBBER) + SND_STONE_RUBBER, + SND_METAL_RUBBER, + SND_GLASS_RUBBER, + SND_WOOD_RUBBER, + SND_FLESH_RUBBER, + SND_RUBBER_PLASTIC, + SND_RUBBER_RUBBER }; S32 LLVOAvatar::sRenderName = RENDER_NAME_ALWAYS; diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp index d15a2dc..fb9c258 100644 --- a/linden/indra/newview/llvosky.cpp +++ b/linden/indra/newview/llvosky.cpp @@ -78,9 +78,13 @@ static const LLVector2 TEX01 = LLVector2(0.f, 1.f); static const LLVector2 TEX10 = LLVector2(1.f, 0.f); static const LLVector2 TEX11 = LLVector2(1.f, 1.f); -// Exported globals +// Exported global semi-constants. LLUUID gSunTextureID = IMG_SUN; LLUUID gMoonTextureID = IMG_MOON; +// Exported global constants. +LLColor3 const gAirScaSeaLevel = calc_air_sca_sea_level(); +F32 const AIR_SCA_INTENS = color_intens(gAirScaSeaLevel); +F32 const AIR_SCA_AVG = AIR_SCA_INTENS / 3.f; //static LLColor3 LLHaze::sAirScaSeaLevel; diff --git a/linden/indra/newview/llvosky.h b/linden/indra/newview/llvosky.h index dabf5b1..1370824 100644 --- a/linden/indra/newview/llvosky.h +++ b/linden/indra/newview/llvosky.h @@ -311,9 +311,10 @@ LL_FORCE_INLINE LLColor3 calc_air_sca_sea_level() return dens_div_N * color_div ( mult_const, wl4 ); } -const LLColor3 gAirScaSeaLevel = calc_air_sca_sea_level(); -const F32 AIR_SCA_INTENS = color_intens(gAirScaSeaLevel); -const F32 AIR_SCA_AVG = AIR_SCA_INTENS / 3.f; +// Non-POD constants. +extern LLColor3 const gAirScaSeaLevel; +extern F32 const AIR_SCA_INTENS; +extern F32 const AIR_SCA_AVG; class LLHaze { -- cgit v1.1