diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs index 5417c8d576..d4dd0db3b9 100644 --- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs +++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs @@ -35,6 +35,7 @@ namespace OpenSim.Region.Environment.Scenes { public Dictionary AnimsUUID = new Dictionary(); public Dictionary AnimsNames = new Dictionary(); + public Dictionary AnimStateNames = new Dictionary(); public AvatarAnimations() { @@ -46,11 +47,14 @@ namespace OpenSim.Region.Environment.Scenes { if (nod.Attributes["name"] != null) { - string name = (string)nod.Attributes["name"].Value; + string name = (string)nod.Attributes["name"].Value; UUID id = (UUID)nod.InnerText; + string animState = (string)nod.Attributes["state"].Value; AnimsUUID.Add(name, id); AnimsNames.Add(id, name); + if (animState != "") + AnimStateNames.Add(id, animState); } } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 778cf9fb25..eefb8e68c3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -3486,14 +3486,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api ScenePresence presence = World.GetScenePresence(avatar); if (m_host.RegionHandle == presence.RegionHandle) { - Dictionary animationNames = AnimationSet.Animations.AnimsNames; + Dictionary animationstateNames = AnimationSet.Animations.AnimStateNames; if (presence != null) { AnimationSet currentAnims = presence.Animations; - string currentAnimation = String.Empty; - if (animationNames.TryGetValue(currentAnims.DefaultAnimation.AnimID, out currentAnimation)) - return currentAnimation; + string currentAnimationState = String.Empty; + if (animationstateNames.TryGetValue(currentAnims.DefaultAnimation.AnimID, out currentAnimationState)) + return currentAnimationState; } } return String.Empty; diff --git a/bin/data/avataranimations.xml b/bin/data/avataranimations.xml index 8486bc722b..ca8bbfe9bd 100644 --- a/bin/data/avataranimations.xml +++ b/bin/data/avataranimations.xml @@ -4,118 +4,118 @@ - 46bb4359-de38-4ed8-6a22-f1f52fe8f506 - b5b4a67d-0aee-30d2-72cd-77b333e932ef - 3147d815-6338-b932-f011-16b56d9ac18b - ea633413-8006-180a-c3ba-96dd1d756720 - c1bc7f36-3ba0-d844-f93c-93be945d644f - 11000694-3f41-adc2-606b-eee1d66f3724 - fd037134-85d4-f241-72c6-4f42164fedee - c4ca6188-9127-4f31-0158-23c4e2f93304 - db84829b-462c-ee83-1e27-9bbee66bd624 - 82e99230-c906-1403-4d9c-3889dd98daba - 349a3801-54f9-bf2c-3bd0-1ac89772af01 - 9b0c1c4e-8ac7-7969-1494-28c874c4f668 - 9ba1c942-08be-e43a-fb29-16ad440efc50 - 201f3fdf-cb1f-dbec-201f-7333e328ae7c - 47f5f6fb-22e5-ae44-f871-73aaaf4a6022 - b68a3d7c-de9e-fc87-eec8-543d787e5b0d - 928cae18-e31d-76fd-9cc9-2f55160ff818 - 30047778-10ea-1af7-6881-4db7a3a5a114 - 951469f4-c7b2-c818-9dee-ad7eea8c30b7 - 4bd69a1d-1114-a0b4-625f-84e0a5237155 - cd28b69b-9c95-bb78-3f94-8d605ff1bb12 - a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6 - b0dc417c-1f11-af36-2e80-7e7489fa7cdc - 57abaae6-1d17-7b1b-5f98-6d11a6411276 - 0f86e355-dd31-a61c-fdb0-3a96b9aad05f - 6b61c8e8-4747-0d75-12d7-e49ff207a4ca - 5747a48e-073e-c331-f6f3-7c2149613d3e - b906c4ba-703b-1940-32a3-0c7f7d791510 - 92624d3e-1068-f1aa-a5ec-8244585193ed - 514af488-9051-044a-b3fc-d4dbf76377c6 - 18b3a4b5-b463-bd48-e4b6-71eaac76c515 - 36f81a92-f076-5893-dc4b-7c3795e487cf - 0eb702e2-cc5a-9a88-56a5-661a55c0676a - 70ea714f-3a97-d742-1b01-590a8fcd1db5 - 313b9881-4302-73c0-c7d0-0e7a36b6c224 - 869ecdad-a44b-671e-3266-56aef2e3ac2e - 9f496bd2-589a-709f-16cc-69bf7df1d36c - 666307d9-a860-572d-6fd4-c3ab8865c094 - f5fc7433-043d-e819-8298-f519a119b688 - 7db00ccd-f380-f3ee-439d-61968ec69c8a - aec4610c-757f-bc4e-c092-c6e9caf18daf - 2b5a38b2-5e00-3a97-a495-4c826bc443e6 - 9b29cd61-c45b-5689-ded2-91756b8d76a9 - 8b102617-bcba-037b-86c1-b76219f90c88 - ef62d355-c815-4816-2474-b1acc21094a6 - efdc1727-8b8a-c800-4077-975fc27ee2f2 - 3d94bad0-c55b-7dcc-8763-033c59405d33 - 4ae8016b-31b9-03bb-c401-b1ea941db41d - 20f063ea-8306-2562-0b07-5c853b37b31e - 62c5de58-cb33-5743-3d07-9e4cd4352864 - 5ea3991f-c293-392e-6860-91dfa01278a3 - 2305bd75-1ca9-b03b-1faa-b176b8a8c49e - 709ea28e-1573-c023-8bf8-520c8bc637fa - 49aea43b-5ac3-8a44-b595-96100af0beda - 19999406-3a3a-d58c-a2ac-d72e555dcf51 - 7a17b059-12b2-41b1-570a-186368b6aa6f - ca5b3f14-3194-7a2b-c894-aa699b718d1f - 08464f78-3a8e-2944-cba5-0c94aff3af29 - 315c3a41-a5f3-0ba4-27da-f893f769e69b - 5a977ed9-7f72-44e9-4c4c-6e913df8ae74 - d83fa0e5-97ed-7eb2-e798-7bd006215cb4 - f061723d-0a18-754f-66ee-29a44795a32f - b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9 - 17c024cc-eef2-f6a0-3527-9869876d7752 - ec952cca-61ef-aa3b-2789-4d1344f016de - 7a4e87fe-de39-6fcb-6223-024b00893244 - f3300ad9-3462-1d07-2044-0fef80062da0 - eefc79be-daae-a239-8c04-890f5d23654a - c8e42d32-7310-6906-c903-cab5d4a34656 - 35db4f7e-28c2-6679-cea9-3ee108f7fc7f - 0836b67f-7f7b-f37b-c00a-460dc1521f5a - 42dd95d5-0bc6-6392-f650-777304946c0f - 16803a9f-5140-e042-4d7b-d28ba247c325 - 05ddbff8-aaa9-92a1-2b74-8fe77a29b445 - cd7668a6-7011-d7e2-ead8-fc69eff1a104 - e04d450d-fdb5-0432-fd68-818aaf5935f8 - 6bd01860-4ebd-127a-bb3d-d1427e8e0c42 - 1a5fe8ac-a804-8a5d-7cbd-56bd83184568 - b1709c8d-ecd3-54a1-4f28-d55ac0840782 - 245f3c54-f1c0-bf2e-811f-46d8eeb386e7 - 1c7600d6-661f-b87b-efe2-d7421eb93c86 - 1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e - a8dee56f-2eae-9e7a-05a2-6fb92b97e21e - f2bed5f9-9d44-39af-b0cd-257b2a17fe40 - d2f2ee58-8ad1-06c9-d8d3-3827ba31567a - 6802d553-49da-0778-9f85-1599a2266526 - 0a9fb970-8b44-9114-d3a9-bf69cfe804d6 - eae8905b-271a-99e2-4c0e-31106afd100c - f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57 - 2408fe9e-df1d-1d7d-f4ff-1384fa7b350f - 15468e00-3400-bb66-cecc-646d7c14458e - 370f3a20-6ca6-9971-848c-9a01bc42ae3c - 42b46214-4b44-79ae-deb8-0df61424ff4b - f22fed8b-a5ed-2c93-64d5-bdd8b93c889f - 3da1d753-028a-5446-24f3-9c9b856d9422 - 80700431-74ec-a008-14f8-77575e73693f - 1cb562b0-ba21-2202-efb3-30f82cdf9595 - 41426836-7437-7e89-025d-0aa4d10f1d69 - 85428680-6bf9-3e64-b489-6f81087c24bd - 5c682a95-6da4-a463-0bf6-0f5b7be129d1 - aa134404-7dac-7aca-2cba-435f9db875ca - 83ff59fe-2346-f236-9009-4e3608af64c1 - 038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53 - 6883a61a-b27b-5914-a61e-dda118a9ee2c - 56e0ba0d-4a9f-7f27-6117-32f2ebbf6135 - 2d6daa51-3192-6794-8e2e-a15f8338ec30 - c541c47f-e0c0-058b-ad1a-d6ae3a4584d9 - 6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0 - 7693f268-06c7-ea71-fa21-2b30d6533f8f - b1ed7982-c68e-a982-7561-52a88a5298c0 - c0c4030f-c02b-49de-24ba-2331f43fe41c - b8c8b2a3-9008-1771-3bfc-90924955ab2d - 15dd911d-be82-2856-26db-27659b142875 - 42ecd00b-9947-a97c-400a-bbc9174c7aeb + 46bb4359-de38-4ed8-6a22-f1f52fe8f506 + b5b4a67d-0aee-30d2-72cd-77b333e932ef + 3147d815-6338-b932-f011-16b56d9ac18b + ea633413-8006-180a-c3ba-96dd1d756720 + c1bc7f36-3ba0-d844-f93c-93be945d644f + 11000694-3f41-adc2-606b-eee1d66f3724 + fd037134-85d4-f241-72c6-4f42164fedee + c4ca6188-9127-4f31-0158-23c4e2f93304 + db84829b-462c-ee83-1e27-9bbee66bd624 + 82e99230-c906-1403-4d9c-3889dd98daba + 349a3801-54f9-bf2c-3bd0-1ac89772af01 + 9b0c1c4e-8ac7-7969-1494-28c874c4f668 + 9ba1c942-08be-e43a-fb29-16ad440efc50 + 201f3fdf-cb1f-dbec-201f-7333e328ae7c + 47f5f6fb-22e5-ae44-f871-73aaaf4a6022 + b68a3d7c-de9e-fc87-eec8-543d787e5b0d + 928cae18-e31d-76fd-9cc9-2f55160ff818 + 30047778-10ea-1af7-6881-4db7a3a5a114 + 951469f4-c7b2-c818-9dee-ad7eea8c30b7 + 4bd69a1d-1114-a0b4-625f-84e0a5237155 + cd28b69b-9c95-bb78-3f94-8d605ff1bb12 + a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6 + b0dc417c-1f11-af36-2e80-7e7489fa7cdc + 57abaae6-1d17-7b1b-5f98-6d11a6411276 + 0f86e355-dd31-a61c-fdb0-3a96b9aad05f + 6b61c8e8-4747-0d75-12d7-e49ff207a4ca + 5747a48e-073e-c331-f6f3-7c2149613d3e + b906c4ba-703b-1940-32a3-0c7f7d791510 + 92624d3e-1068-f1aa-a5ec-8244585193ed + 514af488-9051-044a-b3fc-d4dbf76377c6 + 18b3a4b5-b463-bd48-e4b6-71eaac76c515 + 36f81a92-f076-5893-dc4b-7c3795e487cf + 0eb702e2-cc5a-9a88-56a5-661a55c0676a + 70ea714f-3a97-d742-1b01-590a8fcd1db5 + 313b9881-4302-73c0-c7d0-0e7a36b6c224 + 869ecdad-a44b-671e-3266-56aef2e3ac2e + 9f496bd2-589a-709f-16cc-69bf7df1d36c + 666307d9-a860-572d-6fd4-c3ab8865c094 + f5fc7433-043d-e819-8298-f519a119b688 + 7db00ccd-f380-f3ee-439d-61968ec69c8a + aec4610c-757f-bc4e-c092-c6e9caf18daf + 2b5a38b2-5e00-3a97-a495-4c826bc443e6 + 9b29cd61-c45b-5689-ded2-91756b8d76a9 + 8b102617-bcba-037b-86c1-b76219f90c88 + ef62d355-c815-4816-2474-b1acc21094a6 + efdc1727-8b8a-c800-4077-975fc27ee2f2 + 3d94bad0-c55b-7dcc-8763-033c59405d33 + 4ae8016b-31b9-03bb-c401-b1ea941db41d + 20f063ea-8306-2562-0b07-5c853b37b31e + 62c5de58-cb33-5743-3d07-9e4cd4352864 + 5ea3991f-c293-392e-6860-91dfa01278a3 + 2305bd75-1ca9-b03b-1faa-b176b8a8c49e + 709ea28e-1573-c023-8bf8-520c8bc637fa + 49aea43b-5ac3-8a44-b595-96100af0beda + 19999406-3a3a-d58c-a2ac-d72e555dcf51 + 7a17b059-12b2-41b1-570a-186368b6aa6f + ca5b3f14-3194-7a2b-c894-aa699b718d1f + 08464f78-3a8e-2944-cba5-0c94aff3af29 + 315c3a41-a5f3-0ba4-27da-f893f769e69b + 5a977ed9-7f72-44e9-4c4c-6e913df8ae74 + d83fa0e5-97ed-7eb2-e798-7bd006215cb4 + f061723d-0a18-754f-66ee-29a44795a32f + b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9 + 17c024cc-eef2-f6a0-3527-9869876d7752 + ec952cca-61ef-aa3b-2789-4d1344f016de + 7a4e87fe-de39-6fcb-6223-024b00893244 + f3300ad9-3462-1d07-2044-0fef80062da0 + eefc79be-daae-a239-8c04-890f5d23654a + c8e42d32-7310-6906-c903-cab5d4a34656 + 35db4f7e-28c2-6679-cea9-3ee108f7fc7f + 0836b67f-7f7b-f37b-c00a-460dc1521f5a + 42dd95d5-0bc6-6392-f650-777304946c0f + 16803a9f-5140-e042-4d7b-d28ba247c325 + 05ddbff8-aaa9-92a1-2b74-8fe77a29b445 + cd7668a6-7011-d7e2-ead8-fc69eff1a104 + e04d450d-fdb5-0432-fd68-818aaf5935f8 + 6bd01860-4ebd-127a-bb3d-d1427e8e0c42 + 1a5fe8ac-a804-8a5d-7cbd-56bd83184568 + b1709c8d-ecd3-54a1-4f28-d55ac0840782 + 245f3c54-f1c0-bf2e-811f-46d8eeb386e7 + 1c7600d6-661f-b87b-efe2-d7421eb93c86 + 1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e + a8dee56f-2eae-9e7a-05a2-6fb92b97e21e + f2bed5f9-9d44-39af-b0cd-257b2a17fe40 + d2f2ee58-8ad1-06c9-d8d3-3827ba31567a + 6802d553-49da-0778-9f85-1599a2266526 + 0a9fb970-8b44-9114-d3a9-bf69cfe804d6 + eae8905b-271a-99e2-4c0e-31106afd100c + f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57 + 2408fe9e-df1d-1d7d-f4ff-1384fa7b350f + 15468e00-3400-bb66-cecc-646d7c14458e + 370f3a20-6ca6-9971-848c-9a01bc42ae3c + 42b46214-4b44-79ae-deb8-0df61424ff4b + f22fed8b-a5ed-2c93-64d5-bdd8b93c889f + 3da1d753-028a-5446-24f3-9c9b856d9422 + 80700431-74ec-a008-14f8-77575e73693f + 1cb562b0-ba21-2202-efb3-30f82cdf9595 + 41426836-7437-7e89-025d-0aa4d10f1d69 + 85428680-6bf9-3e64-b489-6f81087c24bd + 5c682a95-6da4-a463-0bf6-0f5b7be129d1 + aa134404-7dac-7aca-2cba-435f9db875ca + 83ff59fe-2346-f236-9009-4e3608af64c1 + 038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53 + 6883a61a-b27b-5914-a61e-dda118a9ee2c + 56e0ba0d-4a9f-7f27-6117-32f2ebbf6135 + 2d6daa51-3192-6794-8e2e-a15f8338ec30 + c541c47f-e0c0-058b-ad1a-d6ae3a4584d9 + 6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0 + 7693f268-06c7-ea71-fa21-2b30d6533f8f + b1ed7982-c68e-a982-7561-52a88a5298c0 + c0c4030f-c02b-49de-24ba-2331f43fe41c + b8c8b2a3-9008-1771-3bfc-90924955ab2d + 15dd911d-be82-2856-26db-27659b142875 + 42ecd00b-9947-a97c-400a-bbc9174c7aeb