aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
-rw-r--r--bin/data/avataranimations.xml125
2 files changed, 115 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 307dec7..4502fb3 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -749,7 +749,7 @@ namespace OpenSim.Region.Environment.Scenes
749 { 749 {
750 direc.z *= 3; 750 direc.z *= 3;
751 //System.Console.WriteLine("Jump"); 751 //System.Console.WriteLine("Jump");
752 SendAnimPack(Animations.AnimsLLUUID["PRE_JUMP"], 1); 752 SendAnimPack(Animations.AnimsLLUUID["PREJUMP"], 1);
753 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1); 753 SendAnimPack(Animations.AnimsLLUUID["JUMP"], 1);
754 } 754 }
755 } 755 }
diff --git a/bin/data/avataranimations.xml b/bin/data/avataranimations.xml
index e894283..8486bc7 100644
--- a/bin/data/avataranimations.xml
+++ b/bin/data/avataranimations.xml
@@ -4,15 +4,118 @@
4<!-- This file is a derivative work of the above while it contains default animation UUIDs --> 4<!-- This file is a derivative work of the above while it contains default animation UUIDs -->
5<!-- Licensed under a creative commons license (By-SA) http://creativecommons.org/licenses/by-sa/2.5/ --> 5<!-- Licensed under a creative commons license (By-SA) http://creativecommons.org/licenses/by-sa/2.5/ -->
6<animations> 6<animations>
7 <animation name="STAND">2408fe9e-df1d-1d7d-f4ff-1384fa7b350f</animation> 7 <animation name="AIM_L_BOW">46bb4359-de38-4ed8-6a22-f1f52fe8f506</animation>
8 <animation name="WALK">6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0</animation> 8 <animation name="AIM_R_BAZOOKA">b5b4a67d-0aee-30d2-72cd-77b333e932ef</animation>
9 <animation name="FLY">aec4610c-757f-bc4e-c092-c6e9caf18daf</animation> 9 <animation name="AIM_R_HANDGUN">3147d815-6338-b932-f011-16b56d9ac18b</animation>
10 <animation name="SIT">1a5fe8ac-a804-8a5d-7cbd-56bd83184568</animation> 10 <animation name="AIM_R_RIFLE">ea633413-8006-180a-c3ba-96dd1d756720</animation>
11 <animation name="PRE_JUMP">7a4e87fe-de39-6fcb-6223-024b00893244</animation> 11 <animation name="ANGRY_FINGERWAG">c1bc7f36-3ba0-d844-f93c-93be945d644f</animation>
12 <animation name="CROUCH">201f3fdf-cb1f-dbec-201f-7333e328ae7c</animation> 12 <animation name="ANGRY_TANTRUM">11000694-3f41-adc2-606b-eee1d66f3724</animation>
13 <animation name="CROUCHWALK">47f5f6fb-22e5-ae44-f871-73aaaf4a6022</animation> 13 <animation name="AWAY">fd037134-85d4-f241-72c6-4f42164fedee</animation>
14 <animation name="TYPE">c541c47f-e0c0-058b-ad1a-d6ae3a4584d9</animation> 14 <animation name="BACKFLIP">c4ca6188-9127-4f31-0158-23c4e2f93304</animation>
15 <animation name="FALLDOWN">666307d9-a860-572d-6fd4-c3ab8865c094</animation> 15 <animation name="BLOWKISS">db84829b-462c-ee83-1e27-9bbee66bd624</animation>
16 <animation name="JUMP">2305bd75-1ca9-b03b-1faa-b176b8a8c49e</animation> 16 <animation name="BOW">82e99230-c906-1403-4d9c-3889dd98daba</animation>
17 <animation name="RUN">05ddbff8-aaa9-92a1-2b74-8fe77a29b445</animation> 17 <animation name="BRUSH">349a3801-54f9-bf2c-3bd0-1ac89772af01</animation>
18 <animation name="CLAP">9b0c1c4e-8ac7-7969-1494-28c874c4f668</animation>
19 <animation name="COURTBOW">9ba1c942-08be-e43a-fb29-16ad440efc50</animation>
20 <animation name="CROUCH">201f3fdf-cb1f-dbec-201f-7333e328ae7c</animation>
21 <animation name="CROUCHWALK">47f5f6fb-22e5-ae44-f871-73aaaf4a6022</animation>
22 <animation name="DANCE1">b68a3d7c-de9e-fc87-eec8-543d787e5b0d</animation>
23 <animation name="DANCE2">928cae18-e31d-76fd-9cc9-2f55160ff818</animation>
24 <animation name="DANCE3">30047778-10ea-1af7-6881-4db7a3a5a114</animation>
25 <animation name="DANCE4">951469f4-c7b2-c818-9dee-ad7eea8c30b7</animation>
26 <animation name="DANCE5">4bd69a1d-1114-a0b4-625f-84e0a5237155</animation>
27 <animation name="DANCE6">cd28b69b-9c95-bb78-3f94-8d605ff1bb12</animation>
28 <animation name="DANCE7">a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6</animation>
29 <animation name="DANCE8">b0dc417c-1f11-af36-2e80-7e7489fa7cdc</animation>
30 <animation name="DEAD">57abaae6-1d17-7b1b-5f98-6d11a6411276</animation>
31 <animation name="DRINK">0f86e355-dd31-a61c-fdb0-3a96b9aad05f</animation>
32 <animation name="EXPRESS_AFRAID">6b61c8e8-4747-0d75-12d7-e49ff207a4ca</animation>
33 <animation name="EXPRESS_ANGER">5747a48e-073e-c331-f6f3-7c2149613d3e</animation>
34 <animation name="EXPRESS_BORED">b906c4ba-703b-1940-32a3-0c7f7d791510</animation>
35 <animation name="EXPRESS_CRY">92624d3e-1068-f1aa-a5ec-8244585193ed</animation>
36 <animation name="EXPRESS_EMBARRASED">514af488-9051-044a-b3fc-d4dbf76377c6</animation>
37 <animation name="EXPRESS_LAUGH">18b3a4b5-b463-bd48-e4b6-71eaac76c515</animation>
38 <animation name="EXPRESS_REPULSED">36f81a92-f076-5893-dc4b-7c3795e487cf</animation>
39 <animation name="EXPRESS_SAD">0eb702e2-cc5a-9a88-56a5-661a55c0676a</animation>
40 <animation name="EXPRESS_SHRUG">70ea714f-3a97-d742-1b01-590a8fcd1db5</animation>
41 <animation name="EXPRESS_SURPRISE">313b9881-4302-73c0-c7d0-0e7a36b6c224</animation>
42 <animation name="EXPRESS_WINK">869ecdad-a44b-671e-3266-56aef2e3ac2e</animation>
43 <animation name="EXPRESS_WORRY">9f496bd2-589a-709f-16cc-69bf7df1d36c</animation>
44 <animation name="FALLDOWN">666307d9-a860-572d-6fd4-c3ab8865c094</animation>
45 <animation name="FEMALE_WALK">f5fc7433-043d-e819-8298-f519a119b688</animation>
46 <animation name="FIST_PUMP">7db00ccd-f380-f3ee-439d-61968ec69c8a</animation>
47 <animation name="FLY">aec4610c-757f-bc4e-c092-c6e9caf18daf</animation>
48 <animation name="FLYSLOW">2b5a38b2-5e00-3a97-a495-4c826bc443e6</animation>
49 <animation name="HELLO">9b29cd61-c45b-5689-ded2-91756b8d76a9</animation>
50 <animation name="HOLD_L_BOW">8b102617-bcba-037b-86c1-b76219f90c88</animation>
51 <animation name="HOLD_R_BAZOOKA">ef62d355-c815-4816-2474-b1acc21094a6</animation>
52 <animation name="HOLD_R_HANDGUN">efdc1727-8b8a-c800-4077-975fc27ee2f2</animation>
53 <animation name="HOLD_R_RIFLE">3d94bad0-c55b-7dcc-8763-033c59405d33</animation>
54 <animation name="HOVER">4ae8016b-31b9-03bb-c401-b1ea941db41d</animation>
55 <animation name="HOVER_DOWN">20f063ea-8306-2562-0b07-5c853b37b31e</animation>
56 <animation name="HOVER_UP">62c5de58-cb33-5743-3d07-9e4cd4352864</animation>
57 <animation name="IMPATIENT">5ea3991f-c293-392e-6860-91dfa01278a3</animation>
58 <animation name="JUMP">2305bd75-1ca9-b03b-1faa-b176b8a8c49e</animation>
59 <animation name="JUMPFORJOY">709ea28e-1573-c023-8bf8-520c8bc637fa</animation>
60 <animation name="KICK_ROUNDHOUSE_R">49aea43b-5ac3-8a44-b595-96100af0beda</animation>
61 <animation name="KISSMYBUTT">19999406-3a3a-d58c-a2ac-d72e555dcf51</animation>
62 <animation name="LAND">7a17b059-12b2-41b1-570a-186368b6aa6f</animation>
63 <animation name="LAUGH_SHORT">ca5b3f14-3194-7a2b-c894-aa699b718d1f</animation>
64 <animation name="MOTORCYCLE_SIT">08464f78-3a8e-2944-cba5-0c94aff3af29</animation>
65 <animation name="MUSCLEBEACH">315c3a41-a5f3-0ba4-27da-f893f769e69b</animation>
66 <animation name="NO_HEAD">5a977ed9-7f72-44e9-4c4c-6e913df8ae74</animation>
67 <animation name="NO_UNHAPPY">d83fa0e5-97ed-7eb2-e798-7bd006215cb4</animation>
68 <animation name="NYANYA">f061723d-0a18-754f-66ee-29a44795a32f</animation>
69 <animation name="PEACE">b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9</animation>
70 <animation name="POINT_ME">17c024cc-eef2-f6a0-3527-9869876d7752</animation>
71 <animation name="POINT_YOU">ec952cca-61ef-aa3b-2789-4d1344f016de</animation>
72 <animation name="PREJUMP">7a4e87fe-de39-6fcb-6223-024b00893244</animation>
73 <animation name="PUNCH_L">f3300ad9-3462-1d07-2044-0fef80062da0</animation>
74 <animation name="PUNCH_ONETWO">eefc79be-daae-a239-8c04-890f5d23654a</animation>
75 <animation name="PUNCH_R">c8e42d32-7310-6906-c903-cab5d4a34656</animation>
76 <animation name="RPS_COUNTDOWN">35db4f7e-28c2-6679-cea9-3ee108f7fc7f</animation>
77 <animation name="RPS_PAPER">0836b67f-7f7b-f37b-c00a-460dc1521f5a</animation>
78 <animation name="RPS_ROCK">42dd95d5-0bc6-6392-f650-777304946c0f</animation>
79 <animation name="RPS_SCISSORS">16803a9f-5140-e042-4d7b-d28ba247c325</animation>
80 <animation name="RUN">05ddbff8-aaa9-92a1-2b74-8fe77a29b445</animation>
81 <animation name="SALUTE">cd7668a6-7011-d7e2-ead8-fc69eff1a104</animation>
82 <animation name="SHOOT_L_BOW">e04d450d-fdb5-0432-fd68-818aaf5935f8</animation>
83 <animation name="SHOUT">6bd01860-4ebd-127a-bb3d-d1427e8e0c42</animation>
84 <animation name="SIT">1a5fe8ac-a804-8a5d-7cbd-56bd83184568</animation>
85 <animation name="SIT_FEMALE">b1709c8d-ecd3-54a1-4f28-d55ac0840782</animation>
86 <animation name="SIT_GENERIC">245f3c54-f1c0-bf2e-811f-46d8eeb386e7</animation>
87 <animation name="SIT_GROUND">1c7600d6-661f-b87b-efe2-d7421eb93c86</animation>
88 <animation name="SIT_GROUND_CONSTRAINED">1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e</animation>
89 <animation name="SIT_TO_STAND">a8dee56f-2eae-9e7a-05a2-6fb92b97e21e</animation>
90 <animation name="SLEEP">f2bed5f9-9d44-39af-b0cd-257b2a17fe40</animation>
91 <animation name="SMOKE_IDLE">d2f2ee58-8ad1-06c9-d8d3-3827ba31567a</animation>
92 <animation name="SMOKE_INHALE">6802d553-49da-0778-9f85-1599a2266526</animation>
93 <animation name="SMOKE_THROW_DOWN">0a9fb970-8b44-9114-d3a9-bf69cfe804d6</animation>
94 <animation name="SNAPSHOT">eae8905b-271a-99e2-4c0e-31106afd100c</animation>
95 <animation name="SOFT_LAND">f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57</animation>
96 <animation name="STAND">2408fe9e-df1d-1d7d-f4ff-1384fa7b350f</animation>
97 <animation name="STAND_1">15468e00-3400-bb66-cecc-646d7c14458e</animation>
98 <animation name="STAND_2">370f3a20-6ca6-9971-848c-9a01bc42ae3c</animation>
99 <animation name="STAND_3">42b46214-4b44-79ae-deb8-0df61424ff4b</animation>
100 <animation name="STAND_4">f22fed8b-a5ed-2c93-64d5-bdd8b93c889f</animation>
101 <animation name="STANDUP">3da1d753-028a-5446-24f3-9c9b856d9422</animation>
102 <animation name="STRETCH">80700431-74ec-a008-14f8-77575e73693f</animation>
103 <animation name="STRIDE">1cb562b0-ba21-2202-efb3-30f82cdf9595</animation>
104 <animation name="SURF">41426836-7437-7e89-025d-0aa4d10f1d69</animation>
105 <animation name="SWORD_STRIKE_R">85428680-6bf9-3e64-b489-6f81087c24bd</animation>
106 <animation name="TALK">5c682a95-6da4-a463-0bf6-0f5b7be129d1</animation>
107 <animation name="THROW_R">aa134404-7dac-7aca-2cba-435f9db875ca</animation>
108 <animation name="TRYON_SHIRT">83ff59fe-2346-f236-9009-4e3608af64c1</animation>
109 <animation name="TURN_180">038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53</animation>
110 <animation name="TURNBACK_180">6883a61a-b27b-5914-a61e-dda118a9ee2c</animation>
111 <animation name="TURNLEFT">56e0ba0d-4a9f-7f27-6117-32f2ebbf6135</animation>
112 <animation name="TURNRIGHT">2d6daa51-3192-6794-8e2e-a15f8338ec30</animation>
113 <animation name="TYPE">c541c47f-e0c0-058b-ad1a-d6ae3a4584d9</animation>
114 <animation name="WALK">6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0</animation>
115 <animation name="WHISPER">7693f268-06c7-ea71-fa21-2b30d6533f8f</animation>
116 <animation name="WHISTLE">b1ed7982-c68e-a982-7561-52a88a5298c0</animation>
117 <animation name="WINK_HOLLYWOOD">c0c4030f-c02b-49de-24ba-2331f43fe41c</animation>
118 <animation name="YES_HAPPY">b8c8b2a3-9008-1771-3bfc-90924955ab2d</animation>
119 <animation name="YES_HEAD">15dd911d-be82-2856-26db-27659b142875</animation>
120 <animation name="YOGA_FLOAT">42ecd00b-9947-a97c-400a-bbc9174c7aeb</animation>
18</animations> 121</animations>