diff options
author | Melanie Thielker | 2014-09-09 04:12:10 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-09-09 04:12:10 +0200 |
commit | 18023169e79584cd3ddb4f544f9d485edc9e1b85 (patch) | |
tree | 8a52d892be3aa1868537639b7b255f83685f259b /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Also check standard anim names (diff) | |
download | opensim-SC-18023169e79584cd3ddb4f544f9d485edc9e1b85.zip opensim-SC-18023169e79584cd3ddb4f544f9d485edc9e1b85.tar.gz opensim-SC-18023169e79584cd3ddb4f544f9d485edc9e1b85.tar.bz2 opensim-SC-18023169e79584cd3ddb4f544f9d485edc9e1b85.tar.xz |
Actually do the overriding
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4d5f747..8f6b41b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -239,6 +239,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
239 | /// </value> | 239 | /// </value> |
240 | public ScenePresenceAnimator Animator { get; private set; } | 240 | public ScenePresenceAnimator Animator { get; private set; } |
241 | 241 | ||
242 | /// <value> | ||
243 | /// Server Side Animation Override | ||
244 | /// </value> | ||
245 | public MovementAnimationOverrides Overrides { get; private set; } | ||
246 | |||
242 | /// <summary> | 247 | /// <summary> |
243 | /// Attachments recorded on this avatar. | 248 | /// Attachments recorded on this avatar. |
244 | /// </summary> | 249 | /// </summary> |
@@ -967,6 +972,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
967 | IsLoggingIn = false; | 972 | IsLoggingIn = false; |
968 | m_sendCoarseLocationsMethod = SendCoarseLocationsDefault; | 973 | m_sendCoarseLocationsMethod = SendCoarseLocationsDefault; |
969 | Animator = new ScenePresenceAnimator(this); | 974 | Animator = new ScenePresenceAnimator(this); |
975 | Overrides = new MovementAnimationOverrides(); | ||
970 | PresenceType = type; | 976 | PresenceType = type; |
971 | DrawDistance = world.DefaultDrawDistance; | 977 | DrawDistance = world.DefaultDrawDistance; |
972 | RegionHandle = world.RegionInfo.RegionHandle; | 978 | RegionHandle = world.RegionInfo.RegionHandle; |
@@ -6007,6 +6013,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
6007 | 6013 | ||
6008 | public void SetAnimationOverride(string animState, UUID animID) | 6014 | public void SetAnimationOverride(string animState, UUID animID) |
6009 | { | 6015 | { |
6016 | Overrides.SetOverride(animState, animID); | ||
6010 | } | 6017 | } |
6011 | } | 6018 | } |
6012 | } | 6019 | } |