aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs27
1 files changed, 1 insertions, 26 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 051c4fa..d973a06 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -319,7 +319,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
319 protected readonly UUID m_agentId; 319 protected readonly UUID m_agentId;
320 private readonly uint m_circuitCode; 320 private readonly uint m_circuitCode;
321 private readonly byte[] m_channelVersion = Utils.EmptyBytes; 321 private readonly byte[] m_channelVersion = Utils.EmptyBytes;
322 private readonly Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>();
323 private readonly IGroupsModule m_GroupsModule; 322 private readonly IGroupsModule m_GroupsModule;
324 323
325 private int m_cachedTextureSerial; 324 private int m_cachedTextureSerial;
@@ -463,10 +462,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
463 RegisterInterface<IClientChat>(this); 462 RegisterInterface<IClientChat>(this);
464 RegisterInterface<IClientIPEndpoint>(this); 463 RegisterInterface<IClientIPEndpoint>(this);
465 464
466 InitDefaultAnimations();
467
468 m_scene = scene; 465 m_scene = scene;
469
470 m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); 466 m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
471 m_entityProps = new PriorityQueue(m_scene.Entities.Count); 467 m_entityProps = new PriorityQueue(m_scene.Entities.Count);
472 m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>(); 468 m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
@@ -11373,30 +11369,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11373 OutPacket(scriptQuestion, ThrottleOutPacketType.Task); 11369 OutPacket(scriptQuestion, ThrottleOutPacketType.Task);
11374 } 11370 }
11375 11371
11376 private void InitDefaultAnimations()
11377 {
11378 using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
11379 {
11380 XmlDocument doc = new XmlDocument();
11381 doc.Load(reader);
11382 if (doc.DocumentElement != null)
11383 foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
11384 {
11385 if (nod.Attributes["name"] != null)
11386 {
11387 string name = nod.Attributes["name"].Value.ToLower();
11388 string id = nod.InnerText;
11389 m_defaultAnimations.Add(name, (UUID)id);
11390 }
11391 }
11392 }
11393 }
11394
11395 public UUID GetDefaultAnimation(string name) 11372 public UUID GetDefaultAnimation(string name)
11396 { 11373 {
11397 if (m_defaultAnimations.ContainsKey(name)) 11374 return SLUtil.GetDefaultAvatarAnimation(name);
11398 return m_defaultAnimations[name];
11399 return UUID.Zero;
11400 } 11375 }
11401 11376
11402 /// <summary> 11377 /// <summary>