diff options
| author | Melanie | 2012-03-22 20:38:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-22 20:38:49 +0000 |
| commit | 33818994810130117bae62ba2123bf8b55f181ea (patch) | |
| tree | eeb54ef00919abbd1a86b08a659570512856ac42 /OpenSim/Region/OptionalModules/World | |
| parent | Revert "Stop messing order of updates, destroing the defined order of the sel... (diff) | |
| parent | Rework Diva's patch to simplify it (diff) | |
| download | opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.zip opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.gz opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.bz2 opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
| -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 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; } |