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