From acdb971f13d9fdbab9cb8a215b56da80b8d01233 Mon Sep 17 00:00:00 2001 From: Jim Radford Date: Wed, 7 Oct 2009 03:35:29 +0000 Subject: [PATCH] LIBOMV-576 Removing OpenMetaverseCore library, items combined back into OpenMetaverse.dll due to the insane amount of circular dependencies throughout the library. Reference to "OpenMetaverseCore.dll" is no longer required. git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3129 52acb1d6-8a22-11de-b505-999d5b087335 --- .../CapsToPacket.cs | 0 .../Helpers.cs | 0 .../_Packets_.cs | 16 +++++++ OpenMetaverseCore/AssemblyInfo.cs | 33 --------------- OpenMetaverseCore/CoreTypes.cs | 20 --------- Programs/mapgenerator/template.cs | 16 +++++++ mapgen.bat | 2 +- prebuild.xml | 42 ------------------- 8 files changed, 33 insertions(+), 96 deletions(-) rename {OpenMetaverseCore => OpenMetaverse}/CapsToPacket.cs (100%) rename {OpenMetaverseCore => OpenMetaverse}/Helpers.cs (100%) rename {OpenMetaverseCore => OpenMetaverse}/_Packets_.cs (99%) delete mode 100644 OpenMetaverseCore/AssemblyInfo.cs delete mode 100644 OpenMetaverseCore/CoreTypes.cs diff --git a/OpenMetaverseCore/CapsToPacket.cs b/OpenMetaverse/CapsToPacket.cs similarity index 100% rename from OpenMetaverseCore/CapsToPacket.cs rename to OpenMetaverse/CapsToPacket.cs diff --git a/OpenMetaverseCore/Helpers.cs b/OpenMetaverse/Helpers.cs similarity index 100% rename from OpenMetaverseCore/Helpers.cs rename to OpenMetaverse/Helpers.cs diff --git a/OpenMetaverseCore/_Packets_.cs b/OpenMetaverse/_Packets_.cs similarity index 99% rename from OpenMetaverseCore/_Packets_.cs rename to OpenMetaverse/_Packets_.cs index e31009cd..01894e97 100644 --- a/OpenMetaverseCore/_Packets_.cs +++ b/OpenMetaverse/_Packets_.cs @@ -28,6 +28,22 @@ using System; using System.Text; using OpenMetaverse; +namespace OpenMetaverse +{ + /// + /// + /// + public enum PacketFrequency : byte + { + /// + Low, + /// + Medium, + /// + High + } +} + namespace OpenMetaverse.Packets { /// diff --git a/OpenMetaverseCore/AssemblyInfo.cs b/OpenMetaverseCore/AssemblyInfo.cs deleted file mode 100644 index ae3a15d1..00000000 --- a/OpenMetaverseCore/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OpenMetaverse Networking Core")] -[assembly: AssemblyDescription("The OpenMetaverse Network abstraction library")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("OpenMetaverse")] -[assembly: AssemblyProduct("libOpenMetaverse")] -[assembly: AssemblyCopyright("2009 OpenMetaverse Foundation")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("71acd58b-2794-4ba7-982c-f08568881067")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("0.0.0.*")] -[assembly: AssemblyFileVersion("0.0.0.0")] diff --git a/OpenMetaverseCore/CoreTypes.cs b/OpenMetaverseCore/CoreTypes.cs deleted file mode 100644 index d289efae..00000000 --- a/OpenMetaverseCore/CoreTypes.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace OpenMetaverse -{ - /// - /// - /// - public enum PacketFrequency : byte - { - /// - Low, - /// - Medium, - /// - High - } -} diff --git a/Programs/mapgenerator/template.cs b/Programs/mapgenerator/template.cs index 74ade038..40c3f2f0 100644 --- a/Programs/mapgenerator/template.cs +++ b/Programs/mapgenerator/template.cs @@ -28,6 +28,22 @@ using System; using System.Text; using OpenMetaverse; +namespace OpenMetaverse +{ + /// + /// + /// + public enum PacketFrequency : byte + { + /// + Low, + /// + Medium, + /// + High + } +} + namespace OpenMetaverse.Packets { /// diff --git a/mapgen.bat b/mapgen.bat index 95f8b18b..ab69895a 100644 --- a/mapgen.bat +++ b/mapgen.bat @@ -1 +1 @@ -"bin/mapgenerator.exe" data/message_template.msg Programs/mapgenerator/template.cs Programs/mapgenerator/unusedpackets.txt OpenMetaverseCore/_Packets_.cs \ No newline at end of file +"bin/mapgenerator.exe" data/message_template.msg Programs/mapgenerator/template.cs Programs/mapgenerator/unusedpackets.txt OpenMetaverse/_Packets_.cs \ No newline at end of file diff --git a/prebuild.xml b/prebuild.xml index 70f61f24..504df204 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -146,32 +146,6 @@ - - - - ../bin/ - - - - - ../bin/ - OpenMetaverseCore.XML - - - - ../bin/ - - - - - - - - - - - - @@ -191,7 +165,6 @@ - @@ -221,7 +194,6 @@ - @@ -248,7 +220,6 @@ - @@ -272,7 +243,6 @@ - @@ -366,7 +336,6 @@ - @@ -425,7 +394,6 @@ - @@ -452,7 +420,6 @@ - @@ -554,7 +521,6 @@ - @@ -584,7 +550,6 @@ - @@ -639,7 +604,6 @@ - @@ -670,7 +634,6 @@ - @@ -693,7 +656,6 @@ ../../bin/ - @@ -722,7 +684,6 @@ - @@ -779,7 +740,6 @@ - @@ -805,7 +765,6 @@ ../../../bin/ - @@ -830,7 +789,6 @@ -