aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorDiva Canto2012-03-10 08:09:43 -0800
committerDiva Canto2012-03-10 08:09:43 -0800
commit291dc3969181f4718e84f33e18c4bf9d519cde3d (patch)
treec22f305a20f32b0a390681ca73eab8cc0bf213b0 /OpenSim/Region/OptionalModules
parentSerialize all web requests to a particular host:port pair; only applied to th... (diff)
parentFix TestSaveOarNoAssets() by not launch a no-assets request on a separate thr... (diff)
downloadopensim-SC_OLD-291dc3969181f4718e84f33e18c4bf9d519cde3d.zip
opensim-SC_OLD-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.gz
opensim-SC_OLD-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.bz2
opensim-SC_OLD-291dc3969181f4718e84f33e18c4bf9d519cde3d.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs5
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;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.CoreModules.World.Estate; 36using OpenSim.Region.CoreModules.World.Estate;
37using log4net;
38using System.Reflection;
39using System.Xml;
37 40
38namespace OpenSim.Region.OptionalModules.World.NPC 41namespace 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