aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-03-23 03:41:48 +0000
committerUbitUmarov2012-03-23 03:41:48 +0000
commit4db05a98c2c1678b612e0a3d2f95c24e34ac5f13 (patch)
tree3929bd993c504a3de7697f449e36535aeeddf737 /OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.zip
opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.gz
opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.bz2
opensim-SC-4db05a98c2c1678b612e0a3d2f95c24e34ac5f13.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs5
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 7bd5590..a2375fe 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; }