From d02d925c8610aaf19b332e146bc8f052be0bd65d Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 12 Jun 2007 15:10:05 +0000
Subject: did I say I was doing some rearranging?
---
OpenSim/OpenSim.Region/OpenSim.Region.csproj | 6 +-
OpenSim/OpenSim.Region/OpenSim.Region.dll.build | 2 +-
.../World/Entities/Avatar/Avatar.Animations.cs | 76 ++++++++++++++++++++++
.../World/Entities/Avatar/AvatarAnimations.cs | 73 ---------------------
4 files changed, 80 insertions(+), 77 deletions(-)
create mode 100644 OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Animations.cs
delete mode 100644 OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs
(limited to 'OpenSim')
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 897f70f..a2b50f4 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -157,13 +157,13 @@
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index bcfaaa7..e87c029 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -20,9 +20,9 @@
+
-
diff --git a/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Animations.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Animations.cs
new file mode 100644
index 0000000..5f24cd4
--- /dev/null
+++ b/OpenSim/OpenSim.Region/World/Entities/Avatar/Avatar.Animations.cs
@@ -0,0 +1,76 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using System.Xml;
+
+namespace OpenSim.Region
+{
+ partial class Avatar
+ {
+ public class AvatarAnimations
+ {
+
+ public Dictionary AnimsLLUUID = new Dictionary();
+ public Dictionary AnimsNames = new Dictionary();
+
+ public AvatarAnimations()
+ {
+ }
+
+ public void LoadAnims()
+ {
+ //OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
+ XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
+
+ XmlDocument doc = new XmlDocument();
+ doc.Load(reader);
+ foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
+ {
+
+ if (nod.Attributes["name"] != null)
+ {
+ AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
+ }
+
+ }
+
+ reader.Close();
+
+ // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+
+ foreach (KeyValuePair kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID)
+ {
+ AnimsNames.Add(kp.Value, kp.Key);
+ }
+ }
+ }
+ }
+}
diff --git a/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs b/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs
deleted file mode 100644
index 585cf3c..0000000
--- a/OpenSim/OpenSim.Region/World/Entities/Avatar/AvatarAnimations.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-using System.Xml;
-
-namespace OpenSim.Region
-{
- public class AvatarAnimations
- {
-
- public Dictionary AnimsLLUUID = new Dictionary();
- public Dictionary AnimsNames = new Dictionary();
-
- public AvatarAnimations()
- {
- }
-
- public void LoadAnims()
- {
- //OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
- XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
-
- XmlDocument doc = new XmlDocument();
- doc.Load(reader);
- foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
- {
-
- if ( nod.Attributes["name"] != null)
- {
- AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
- }
-
- }
-
- reader.Close();
-
- // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
-
- foreach (KeyValuePair kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID)
- {
- AnimsNames.Add(kp.Value, kp.Key);
- }
- }
- }
-}
--
cgit v1.1