aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
diff options
context:
space:
mode:
authorBlueWall2012-03-21 20:34:51 -0400
committerBlueWall2012-03-21 20:34:51 -0400
commitc98e3a6422be9a1fc8fef45a6ddb5ba7e37c5dda (patch)
tree3e88ccd53c6b19b0f9bed5345fda7ca5a1b34940 /OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
parentFix typo (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-c98e3a6422be9a1fc8fef45a6ddb5ba7e37c5dda.zip
opensim-SC_OLD-c98e3a6422be9a1fc8fef45a6ddb5ba7e37c5dda.tar.gz
opensim-SC_OLD-c98e3a6422be9a1fc8fef45a6ddb5ba7e37c5dda.tar.bz2
opensim-SC_OLD-c98e3a6422be9a1fc8fef45a6ddb5ba7e37c5dda.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs')
-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 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; }