diff options
author | Melanie Thielker | 2014-09-09 20:50:41 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-09-09 20:50:41 +0200 |
commit | 87a4abac5085f7554699375eaf3d4b6cc621318a (patch) | |
tree | 32a20d19dad92a99c7ecd40d9d0d9ec5989e6c50 /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'ubitworkmaster' (diff) | |
download | opensim-SC-87a4abac5085f7554699375eaf3d4b6cc621318a.zip opensim-SC-87a4abac5085f7554699375eaf3d4b6cc621318a.tar.gz opensim-SC-87a4abac5085f7554699375eaf3d4b6cc621318a.tar.bz2 opensim-SC-87a4abac5085f7554699375eaf3d4b6cc621318a.tar.xz |
Plumb the rest of the serverside AO
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index cecb9cf..b6eb4e4 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -6037,5 +6037,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
6037 | Overrides.SetOverride(animState, animID); | 6037 | Overrides.SetOverride(animState, animID); |
6038 | Animator.SendAnimPack(); | 6038 | Animator.SendAnimPack(); |
6039 | } | 6039 | } |
6040 | |||
6041 | public UUID GetAnimationOverride(string animState) | ||
6042 | { | ||
6043 | return Overrides.GetOverriddenAnimation(animState); | ||
6044 | } | ||
6040 | } | 6045 | } |
6041 | } | 6046 | } |