aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorJeff Ames2008-02-06 10:19:30 +0000
committerJeff Ames2008-02-06 10:19:30 +0000
commit3b42b5f0984fd10de8f49794764f1efd688e8dcd (patch)
tree1d1ea31c04bfd56bd5ac71d425f14b29f239c1e4 /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parent* Fixed script count incrementer. Was decrementing but only incrementing wh... (diff)
downloadopensim-SC_OLD-3b42b5f0984fd10de8f49794764f1efd688e8dcd.zip
opensim-SC_OLD-3b42b5f0984fd10de8f49794764f1efd688e8dcd.tar.gz
opensim-SC_OLD-3b42b5f0984fd10de8f49794764f1efd688e8dcd.tar.bz2
opensim-SC_OLD-3b42b5f0984fd10de8f49794764f1efd688e8dcd.tar.xz
Consolidated LoadAnims and AvatarAnimations constructor.
Fixes locking issues with Animations in ScenePresence (bug #324)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs16
1 files changed, 2 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 5c33dfc..109f23c 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -41,8 +41,9 @@ namespace OpenSim.Region.Environment.Scenes
41 { 41 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 public static AvatarAnimations Animations; 44 public static AvatarAnimations Animations = new AvatarAnimations();
45 public static byte[] DefaultTexture; 45 public static byte[] DefaultTexture;
46
46 public LLUUID currentParcelUUID = LLUUID.Zero; 47 public LLUUID currentParcelUUID = LLUUID.Zero;
47 private List<LLUUID> m_animations = new List<LLUUID>(); 48 private List<LLUUID> m_animations = new List<LLUUID>();
48 private List<int> m_animationSeqs = new List<int>(); 49 private List<int> m_animationSeqs = new List<int>();
@@ -333,12 +334,6 @@ namespace OpenSim.Region.Environment.Scenes
333 334
334 AbsolutePosition = m_controllingClient.StartPos; 335 AbsolutePosition = m_controllingClient.StartPos;
335 336
336 Animations = new AvatarAnimations();
337 lock (Animations)
338 {
339 Animations.LoadAnims();
340 }
341
342 // TODO: m_animations and m_animationSeqs should always be of the same length. 337 // TODO: m_animations and m_animationSeqs should always be of the same length.
343 // Move them into an object to (hopefully) avoid threading issues. 338 // Move them into an object to (hopefully) avoid threading issues.
344 try 339 try
@@ -1643,13 +1638,6 @@ namespace OpenSim.Region.Environment.Scenes
1643 } 1638 }
1644 1639
1645 /// <summary> 1640 /// <summary>
1646 ///
1647 /// </summary>
1648 public static void LoadAnims()
1649 {
1650 }
1651
1652 /// <summary>
1653 /// Handles part of the PID controller function for moving an avatar. 1641 /// Handles part of the PID controller function for moving an avatar.
1654 /// </summary> 1642 /// </summary>
1655 public override void UpdateMovement() 1643 public override void UpdateMovement()