From 49d19e36507a01c657e9e9efb3edbfb5b15ddfa8 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 4 Sep 2015 15:17:53 -0700 Subject: [PATCH] Moved DataSnapshot feature to OptionalModules too. --- .../DataSnapshot/Properties/AssemblyInfo.cs | 33 ----------------- .../DataSnapshot/DataRequestHandler.cs | 0 .../DataSnapshot/DataSnapshotManager.cs | 3 -- .../DataSnapshot/EstateSnapshot.cs | 0 .../DataSnapshot/Interfaces/IDataSnapshot.cs | 0 .../Interfaces/IDataSnapshotProvider.cs | 0 .../DataSnapshot/LLSDDiscovery.cs | 0 .../DataSnapshot/LandSnapshot.cs | 0 .../DataSnapshot/ObjectSnapshot.cs | 0 .../DataSnapshot/SnapshotStore.cs | 0 prebuild.xml | 35 ------------------- 11 files changed, 71 deletions(-) delete mode 100644 OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs rename OpenSim/Region/{ => OptionalModules}/DataSnapshot/DataRequestHandler.cs (100%) rename OpenSim/Region/{ => OptionalModules}/DataSnapshot/DataSnapshotManager.cs (99%) rename OpenSim/Region/{ => OptionalModules}/DataSnapshot/EstateSnapshot.cs (100%) rename OpenSim/Region/{ => OptionalModules}/DataSnapshot/Interfaces/IDataSnapshot.cs (100%) rename OpenSim/Region/{ => OptionalModules}/DataSnapshot/Interfaces/IDataSnapshotProvider.cs (100%) rename OpenSim/Region/{ => OptionalModules}/DataSnapshot/LLSDDiscovery.cs (100%) rename OpenSim/Region/{ => OptionalModules}/DataSnapshot/LandSnapshot.cs (100%) rename OpenSim/Region/{ => OptionalModules}/DataSnapshot/ObjectSnapshot.cs (100%) rename OpenSim/Region/{ => OptionalModules}/DataSnapshot/SnapshotStore.cs (100%) diff --git a/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs b/OpenSim/Region/DataSnapshot/Properties/AssemblyInfo.cs deleted file mode 100644 index e60d3ae0a0..0000000000 --- a/OpenSim/Region/DataSnapshot/Properties/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("OpenSim.Region.DataSnapshot")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("http://opensimulator.org")] -[assembly: AssemblyProduct("OpenSim")] -[assembly: AssemblyCopyright("OpenSimulator developers")] -[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("06c36944-a28d-470e-912c-654c3edaba6b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("0.8.2.*")] - diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs similarity index 100% rename from OpenSim/Region/DataSnapshot/DataRequestHandler.cs rename to OpenSim/Region/OptionalModules/DataSnapshot/DataRequestHandler.cs diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs similarity index 99% rename from OpenSim/Region/DataSnapshot/DataSnapshotManager.cs rename to OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs index d5ae83ee3b..0c3446d56e 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs @@ -43,9 +43,6 @@ using OpenSim.Region.DataSnapshot.Interfaces; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -[assembly: Addin("DataSnapshot", OpenSim.VersionInfo.VersionNumber)] -[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] - namespace OpenSim.Region.DataSnapshot { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DataSnapshotManager")] diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/OptionalModules/DataSnapshot/EstateSnapshot.cs similarity index 100% rename from OpenSim/Region/DataSnapshot/EstateSnapshot.cs rename to OpenSim/Region/OptionalModules/DataSnapshot/EstateSnapshot.cs diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs b/OpenSim/Region/OptionalModules/DataSnapshot/Interfaces/IDataSnapshot.cs similarity index 100% rename from OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs rename to OpenSim/Region/OptionalModules/DataSnapshot/Interfaces/IDataSnapshot.cs diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs b/OpenSim/Region/OptionalModules/DataSnapshot/Interfaces/IDataSnapshotProvider.cs similarity index 100% rename from OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs rename to OpenSim/Region/OptionalModules/DataSnapshot/Interfaces/IDataSnapshotProvider.cs diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/OptionalModules/DataSnapshot/LLSDDiscovery.cs similarity index 100% rename from OpenSim/Region/DataSnapshot/LLSDDiscovery.cs rename to OpenSim/Region/OptionalModules/DataSnapshot/LLSDDiscovery.cs diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs similarity index 100% rename from OpenSim/Region/DataSnapshot/LandSnapshot.cs rename to OpenSim/Region/OptionalModules/DataSnapshot/LandSnapshot.cs diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/OptionalModules/DataSnapshot/ObjectSnapshot.cs similarity index 100% rename from OpenSim/Region/DataSnapshot/ObjectSnapshot.cs rename to OpenSim/Region/OptionalModules/DataSnapshot/ObjectSnapshot.cs diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs similarity index 100% rename from OpenSim/Region/DataSnapshot/SnapshotStore.cs rename to OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs diff --git a/prebuild.xml b/prebuild.xml index d46d178cf3..f47e237a47 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -1895,41 +1895,6 @@ - - - - ../../../bin/ - - - - - ../../../bin/ - - - - ../../../bin/ - - - - - - - - - - - - - - - - - - - - - -