aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-26 17:40:08 +0000
committerJustin Clarke Casey2008-11-26 17:40:08 +0000
commit3e3cf67b00a75bb3bbdd7315b7612cd0a6439449 (patch)
tree5823709ccc3c7aef5dd7144658c96e08b79828a8
parent* Eliminate forceAvatarMovement() in favour of existing AddNewMovement() (diff)
downloadopensim-SC_OLD-3e3cf67b00a75bb3bbdd7315b7612cd0a6439449.zip
opensim-SC_OLD-3e3cf67b00a75bb3bbdd7315b7612cd0a6439449.tar.gz
opensim-SC_OLD-3e3cf67b00a75bb3bbdd7315b7612cd0a6439449.tar.bz2
opensim-SC_OLD-3e3cf67b00a75bb3bbdd7315b7612cd0a6439449.tar.xz
* minor: Remove unused SetAnimation method that was identical to TrySetAnimation
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs14
1 files changed, 1 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index f6b0f68..29c7c3e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1560,18 +1560,6 @@ namespace OpenSim.Region.Environment.Scenes
1560 /// The movement animation is reserved for "main" animations 1560 /// The movement animation is reserved for "main" animations
1561 /// that are mutually exclusive, e.g. flying and sitting. 1561 /// that are mutually exclusive, e.g. flying and sitting.
1562 /// </summary> 1562 /// </summary>
1563 protected void SetMovementAnimation(UUID animID)
1564 {
1565 if (m_animations.SetDefaultAnimation(animID, m_controllingClient.NextAnimationSequenceNumber))
1566 {
1567 SendAnimPack();
1568 }
1569 }
1570
1571 /// <summary>
1572 /// The movement animation is reserved for "main" animations
1573 /// that are mutually exclusive, e.g. flying and sitting.
1574 /// </summary>
1575 protected void TrySetMovementAnimation(string anim) 1563 protected void TrySetMovementAnimation(string anim)
1576 { 1564 {
1577 //m_log.DebugFormat("Updating movement animation to {0}", anim); 1565 //m_log.DebugFormat("Updating movement animation to {0}", anim);
@@ -2055,7 +2043,7 @@ namespace OpenSim.Region.Environment.Scenes
2055 } 2043 }
2056 2044
2057 /// <summary> 2045 /// <summary>
2058 /// 2046 /// Send animation information about this avatar to all clients.
2059 /// </summary> 2047 /// </summary>
2060 public void SendAnimPack() 2048 public void SendAnimPack()
2061 { 2049 {