diff options
author | Justin Clark-Casey (justincc) | 2012-03-21 23:57:39 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-21 23:57:39 +0000 |
commit | 1a8769e6eff0eab750a528f27d127637edbd292b (patch) | |
tree | eb488868d606738222ff47493c82fb19a903cb42 /OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |
parent | If "debug scene updates true" then print out to log when a garbage collection... (diff) | |
download | opensim-SC-1a8769e6eff0eab750a528f27d127637edbd292b.zip opensim-SC-1a8769e6eff0eab750a528f27d127637edbd292b.tar.gz opensim-SC-1a8769e6eff0eab750a528f27d127637edbd292b.tar.bz2 opensim-SC-1a8769e6eff0eab750a528f27d127637edbd292b.tar.xz |
Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead.
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 24b9e6b..16ec34f 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -133,11 +133,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
133 | 133 | ||
134 | } | 134 | } |
135 | 135 | ||
136 | public UUID GetDefaultAnimation(string name) | ||
137 | { | ||
138 | return SLUtil.GetDefaultAvatarAnimation(name); | ||
139 | } | ||
140 | |||
141 | public Vector3 Position | 136 | public Vector3 Position |
142 | { | 137 | { |
143 | get { return m_scene.Entities[m_uuid].AbsolutePosition; } | 138 | get { return m_scene.Entities[m_uuid].AbsolutePosition; } |