From 31dacf6c763742363655367fd4e1f9d298daf1e0 Mon Sep 17 00:00:00 2001 From: MW Date: Fri, 8 Jun 2007 16:01:15 +0000 Subject: Added prebuild.exe and fixed a couple of namespace problems in AvatarAnimations.cs. Now need to update prebuild.xml --- .../RegionServerCommsManager.cs | 1 + .../TestLocalCommsManager.cs | 7 +------ OpenSim/OpenSim.World/AvatarAnimations.cs | 8 ++++---- bin/Prebuild.exe | Bin 0 -> 176128 bytes 4 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 bin/Prebuild.exe diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs index 0b2b72e..fa786d3 100644 --- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs +++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs @@ -9,6 +9,7 @@ using libsecondlife; namespace OpenGrid.Framework.Communications { + public class RegionServerCommsManager { diff --git a/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs b/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs index c82c820..fad2001 100644 --- a/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs +++ b/Common/OpenGrid.Framework.Communications/TestLocalCommsManager.cs @@ -27,16 +27,12 @@ namespace OpenGrid.Framework.Communications public override RegionCommsHostBase RegisterRegion(RegionInfo regionInfo) { //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering"); - if (!this.regions.ContainsKey((uint)regionInfo.RegionHandle)) { //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle ); - this.regions.Add(regionInfo.RegionHandle, regionInfo); RegionCommsHostBase regionHost = new RegionCommsHostBase(); - this.regionHosts.Add(regionInfo.RegionHandle, regionHost); - - + this.regionHosts.Add(regionInfo.RegionHandle, regionHost); return regionHost; } @@ -69,7 +65,6 @@ namespace OpenGrid.Framework.Communications } } } - return neighbours; } diff --git a/OpenSim/OpenSim.World/AvatarAnimations.cs b/OpenSim/OpenSim.World/AvatarAnimations.cs index c7557dc..f13646d 100644 --- a/OpenSim/OpenSim.World/AvatarAnimations.cs +++ b/OpenSim/OpenSim.World/AvatarAnimations.cs @@ -31,7 +31,7 @@ using System.Text; using libsecondlife; using System.Xml; -namespace OpenSim.RegionServer.Simulator +namespace OpenSim { public class AvatarAnimations { @@ -45,7 +45,7 @@ namespace OpenSim.RegionServer.Simulator public void LoadAnims() { - OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations"); + //OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations"); XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"); XmlDocument doc = new XmlDocument(); @@ -62,9 +62,9 @@ namespace OpenSim.RegionServer.Simulator reader.Close(); - OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); + // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); - foreach (KeyValuePair kp in OpenSim.RegionServer.Simulator.Avatar.Animations.AnimsLLUUID) + foreach (KeyValuePair kp in OpenSim.world.Avatar.Animations.AnimsLLUUID) { AnimsNames.Add(kp.Value, kp.Key); } diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe new file mode 100644 index 0000000..4717d79 Binary files /dev/null and b/bin/Prebuild.exe differ -- cgit v1.1