diff options
author | Diva Canto | 2012-03-10 08:09:43 -0800 |
---|---|---|
committer | Diva Canto | 2012-03-10 08:09:43 -0800 |
commit | 291dc3969181f4718e84f33e18c4bf9d519cde3d (patch) | |
tree | c22f305a20f32b0a390681ca73eab8cc0bf213b0 /OpenSim/Region/OptionalModules/World | |
parent | Serialize all web requests to a particular host:port pair; only applied to th... (diff) | |
parent | Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thr... (diff) | |
download | opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.zip opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.gz opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.bz2 opensim-SC-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index be0d56e..24b9e6b 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -34,6 +34,9 @@ using OpenSim.Framework; | |||
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.CoreModules.World.Estate; | 36 | using OpenSim.Region.CoreModules.World.Estate; |
37 | using log4net; | ||
38 | using System.Reflection; | ||
39 | using System.Xml; | ||
37 | 40 | ||
38 | namespace OpenSim.Region.OptionalModules.World.NPC | 41 | namespace OpenSim.Region.OptionalModules.World.NPC |
39 | { | 42 | { |
@@ -132,7 +135,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
132 | 135 | ||
133 | public UUID GetDefaultAnimation(string name) | 136 | public UUID GetDefaultAnimation(string name) |
134 | { | 137 | { |
135 | return UUID.Zero; | 138 | return SLUtil.GetDefaultAvatarAnimation(name); |
136 | } | 139 | } |
137 | 140 | ||
138 | public Vector3 Position | 141 | public Vector3 Position |