diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs index 0f3044eb27..2b2f90d31f 100644 --- a/OpenSim/Data/AssetDataBase.cs +++ b/OpenSim/Data/AssetDataBase.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using libsecondlife; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public abstract class AssetDataBase : IAssetProvider { diff --git a/OpenSim/Data/Base/BaseDataReader.cs b/OpenSim/Data/Base/BaseDataReader.cs index 3baefcdf0c..da90f1029a 100644 --- a/OpenSim/Data/Base/BaseDataReader.cs +++ b/OpenSim/Data/Base/BaseDataReader.cs @@ -29,7 +29,7 @@ using System; using System.Data; using System.IO; -namespace OpenSim.Framework.Data.Base +namespace OpenSim.Data.Base { public abstract class BaseDataReader { diff --git a/OpenSim/Data/Base/BaseDatabaseConnector.cs b/OpenSim/Data/Base/BaseDatabaseConnector.cs index fa3a6c37ce..6988839922 100644 --- a/OpenSim/Data/Base/BaseDatabaseConnector.cs +++ b/OpenSim/Data/Base/BaseDatabaseConnector.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -namespace OpenSim.Framework.Data.Base +namespace OpenSim.Data.Base { public abstract class BaseDatabaseConnector { diff --git a/OpenSim/Data/Base/BaseFieldMapper.cs b/OpenSim/Data/Base/BaseFieldMapper.cs index 03c7bfbe82..64adb32dcb 100644 --- a/OpenSim/Data/Base/BaseFieldMapper.cs +++ b/OpenSim/Data/Base/BaseFieldMapper.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Data.Common; -namespace OpenSim.Framework.Data.Base +namespace OpenSim.Data.Base { public delegate TField ObjectGetAccessor(TObj obj); public delegate void ObjectSetAccessor(TObj obj, TField value); diff --git a/OpenSim/Data/Base/BaseRowMapper.cs b/OpenSim/Data/Base/BaseRowMapper.cs index b008b864bc..45af15a429 100644 --- a/OpenSim/Data/Base/BaseRowMapper.cs +++ b/OpenSim/Data/Base/BaseRowMapper.cs @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; -namespace OpenSim.Framework.Data.Base +namespace OpenSim.Data.Base { public abstract class BaseRowMapper { diff --git a/OpenSim/Data/Base/BaseSchema.cs b/OpenSim/Data/Base/BaseSchema.cs index 8a7ee715ce..f6bea50a4e 100644 --- a/OpenSim/Data/Base/BaseSchema.cs +++ b/OpenSim/Data/Base/BaseSchema.cs @@ -26,9 +26,9 @@ */ using System.Collections.Generic; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; -namespace OpenSim.Framework.Data.Base +namespace OpenSim.Data.Base { public class BaseSchema { diff --git a/OpenSim/Data/Base/BaseTableMapper.cs b/OpenSim/Data/Base/BaseTableMapper.cs index cad4823b6c..d088769dd7 100644 --- a/OpenSim/Data/Base/BaseTableMapper.cs +++ b/OpenSim/Data/Base/BaseTableMapper.cs @@ -28,9 +28,9 @@ using System; using System.Data; using System.Data.Common; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; -namespace OpenSim.Framework.Data.Base +namespace OpenSim.Data.Base { public abstract class BaseTableMapper { diff --git a/OpenSim/Data/Base/Properties/AssemblyInfo.cs b/OpenSim/Data/Base/Properties/AssemblyInfo.cs index ab97490a0b..f851df0b74 100644 --- a/OpenSim/Data/Base/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/Base/Properties/AssemblyInfo.cs @@ -33,11 +33,11 @@ using System.Security; // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly : AssemblyTitle("OpenSim.Framework.Data.Base")] +[assembly : AssemblyTitle("OpenSim.Data.Base")] [assembly : AssemblyDescription("Generic Database Abstraction Layer")] [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("OpenSim Project (www.opensimulator.org)")] -[assembly: AssemblyProduct("OpenSim.Framework.Data.Base")] +[assembly: AssemblyProduct("OpenSim.Data.Base")] [assembly: AssemblyCopyright("Copyright (c) 2007 OpenSim Project (www.opensimulator.org)")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Data/DB4o/DB4oGridData.cs b/OpenSim/Data/DB4o/DB4oGridData.cs index 31b13e3278..d10e7ed904 100644 --- a/OpenSim/Data/DB4o/DB4oGridData.cs +++ b/OpenSim/Data/DB4o/DB4oGridData.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using libsecondlife; -namespace OpenSim.Framework.Data.DB4o +namespace OpenSim.Data.DB4o { /// /// A grid server storage mechanism employing the DB4o database system diff --git a/OpenSim/Data/DB4o/DB4oManager.cs b/OpenSim/Data/DB4o/DB4oManager.cs index 9cacb5e559..c767246680 100644 --- a/OpenSim/Data/DB4o/DB4oManager.cs +++ b/OpenSim/Data/DB4o/DB4oManager.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using Db4objects.Db4o; using libsecondlife; -namespace OpenSim.Framework.Data.DB4o +namespace OpenSim.Data.DB4o { /// /// A Database manager for Db4o diff --git a/OpenSim/Data/DB4o/DB4oUserData.cs b/OpenSim/Data/DB4o/DB4oUserData.cs index 3072e81c71..b2b1f4dffc 100644 --- a/OpenSim/Data/DB4o/DB4oUserData.cs +++ b/OpenSim/Data/DB4o/DB4oUserData.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.IO; using libsecondlife; -namespace OpenSim.Framework.Data.DB4o +namespace OpenSim.Data.DB4o { /// /// A User storage interface for the DB4o database system diff --git a/OpenSim/Data/DB4o/Properties/AssemblyInfo.cs b/OpenSim/Data/DB4o/Properties/AssemblyInfo.cs index ee849381bf..5bfffd730b 100644 --- a/OpenSim/Data/DB4o/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/DB4o/Properties/AssemblyInfo.cs @@ -32,11 +32,11 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly : AssemblyTitle("OpenSim.Framework.Data.DB4o")] +[assembly : AssemblyTitle("OpenSim.Data.DB4o")] [assembly : AssemblyDescription("")] [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] -[assembly : AssemblyProduct("OpenSim.Framework.Data.DB4o")] +[assembly : AssemblyProduct("OpenSim.Data.DB4o")] [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Data/DataStoreBase.cs b/OpenSim/Data/DataStoreBase.cs index 92604f2e17..1044c7683c 100644 --- a/OpenSim/Data/DataStoreBase.cs +++ b/OpenSim/Data/DataStoreBase.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public abstract class DataStoreBase { diff --git a/OpenSim/Data/GridDataBase.cs b/OpenSim/Data/GridDataBase.cs index 9d6e832dfa..004ec9b3cd 100644 --- a/OpenSim/Data/GridDataBase.cs +++ b/OpenSim/Data/GridDataBase.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using libsecondlife; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public abstract class GridDataBase : IGridData { diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs index af51d0db31..feb372e380 100644 --- a/OpenSim/Data/IGridData.cs +++ b/OpenSim/Data/IGridData.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; using libsecondlife; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public enum DataResponse { diff --git a/OpenSim/Data/ILogData.cs b/OpenSim/Data/ILogData.cs index 1751ff518f..a533c87a29 100644 --- a/OpenSim/Data/ILogData.cs +++ b/OpenSim/Data/ILogData.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Framework.Data +namespace OpenSim.Data { /// /// The severity of an individual log message diff --git a/OpenSim/Data/IniConfig.cs b/OpenSim/Data/IniConfig.cs index 47e96c81b1..700a681e3f 100644 --- a/OpenSim/Data/IniConfig.cs +++ b/OpenSim/Data/IniConfig.cs @@ -33,7 +33,7 @@ using System.Text.RegularExpressions; http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html */ -namespace OpenSim.Framework.Data +namespace OpenSim.Data { /// /// Parse settings from ini-like files diff --git a/OpenSim/Data/InventoryDataBase.cs b/OpenSim/Data/InventoryDataBase.cs index afddbf1163..ff87d3cee3 100644 --- a/OpenSim/Data/InventoryDataBase.cs +++ b/OpenSim/Data/InventoryDataBase.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public abstract class InventoryDataBase { diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index 059bb5eec5..6bae356b12 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs @@ -32,7 +32,7 @@ using System.Data.SqlClient; using libsecondlife; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.MSSQL +namespace OpenSim.Data.MSSQL { internal class MSSQLAssetData : AssetDataBase { diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs index d34abe3c1f..525eeca224 100644 --- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs @@ -33,12 +33,12 @@ using System.IO; using libsecondlife; using OpenSim.Framework; using OpenSim.Framework.Console; -using OpenSim.Framework.Data; +using OpenSim.Data; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -using OpenSim.Framework.Data.MSSQL; +using OpenSim.Data.MSSQL; -namespace OpenSim.Framework.Data.MSSQL +namespace OpenSim.Data.MSSQL { public class MSSQLDataStore : IRegionDataStore { diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs index 9bd8acc491..03af53c947 100644 --- a/OpenSim/Data/MSSQL/MSSQLGridData.cs +++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs @@ -33,7 +33,7 @@ using System.Text; using libsecondlife; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.MSSQL +namespace OpenSim.Data.MSSQL { /// /// A grid data interface for Microsoft SQL Server diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs index 1e99e51621..28d787e469 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs @@ -32,7 +32,7 @@ using System.Data.SqlClient; using libsecondlife; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.MSSQL +namespace OpenSim.Data.MSSQL { /// /// A MySQL interface for the inventory server diff --git a/OpenSim/Data/MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs index c76af53fca..2bb58399b3 100644 --- a/OpenSim/Data/MSSQL/MSSQLLogData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLogData.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; using System.Data; -namespace OpenSim.Framework.Data.MSSQL +namespace OpenSim.Data.MSSQL { /// /// An interface to the log database for MySQL diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs index efe62bed90..16f0f9f104 100644 --- a/OpenSim/Data/MSSQL/MSSQLManager.cs +++ b/OpenSim/Data/MSSQL/MSSQLManager.cs @@ -34,7 +34,7 @@ using System.Reflection; using libsecondlife; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.MSSQL +namespace OpenSim.Data.MSSQL { /// /// A management class for the MS SQL Storage Engine diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index be0417dd76..3f5893961b 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs @@ -32,7 +32,7 @@ using System.Data.SqlClient; using libsecondlife; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.MSSQL +namespace OpenSim.Data.MSSQL { /// /// A database interface class to a user profile storage system diff --git a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs index f6ac3288f8..6b2c214199 100644 --- a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs @@ -32,11 +32,11 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly : AssemblyTitle("OpenSim.Framework.Data.MSSQL")] +[assembly : AssemblyTitle("OpenSim.Data.MSSQL")] [assembly : AssemblyDescription("")] [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] -[assembly : AssemblyProduct("OpenSim.Framework.Data.MSSQL")] +[assembly : AssemblyProduct("OpenSim.Data.MSSQL")] [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs index 81f9631258..25ea1b41c0 100644 --- a/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs +++ b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs @@ -28,9 +28,9 @@ using System; using System.Data.Common; using System.Data.SqlClient; -using OpenSim.Framework.Data; +using OpenSim.Data; -namespace OpenSim.Framework.Data.MSSQLMapper +namespace OpenSim.Data.MSSQLMapper { public class MSSQLDatabaseMapper : OpenSimDatabaseConnector { diff --git a/OpenSim/Data/MapperFactory/DataMapperFactory.cs b/OpenSim/Data/MapperFactory/DataMapperFactory.cs index 8995b9e4b2..79c85f8289 100644 --- a/OpenSim/Data/MapperFactory/DataMapperFactory.cs +++ b/OpenSim/Data/MapperFactory/DataMapperFactory.cs @@ -1,9 +1,9 @@ using System; -using OpenSim.Framework.Data.Base; -using OpenSim.Framework.Data.MSSQLMapper; -using OpenSim.Framework.Data.MySQLMapper; +using OpenSim.Data.Base; +using OpenSim.Data.MSSQLMapper; +using OpenSim.Data.MySQLMapper; -namespace OpenSim.Framework.Data.MapperFactory +namespace OpenSim.Data.MapperFactory { public class DataMapperFactory { diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 79994ae93c..d5f7816e37 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs @@ -32,7 +32,7 @@ using libsecondlife; using MySql.Data.MySqlClient; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.MySQL +namespace OpenSim.Data.MySQL { internal class MySQLAssetData : AssetDataBase, IPlugin { diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index eaa7f14792..0d9fb3bec6 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs @@ -36,7 +36,7 @@ using OpenSim.Framework.Console; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -namespace OpenSim.Framework.Data.MySQL +namespace OpenSim.Data.MySQL { public class MySQLDataStore : IRegionDataStore { diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index 61ab067d18..610dfaf465 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs @@ -34,7 +34,7 @@ using System.Text.RegularExpressions; using libsecondlife; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.MySQL +namespace OpenSim.Data.MySQL { /// /// A MySQL Interface for the Grid Server diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 4165d8fd00..326bf60025 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -31,7 +31,7 @@ using libsecondlife; using MySql.Data.MySqlClient; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.MySQL +namespace OpenSim.Data.MySQL { /// /// A MySQL interface for the inventory server diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs index 480446f369..bb34d34232 100644 --- a/OpenSim/Data/MySQL/MySQLLogData.cs +++ b/OpenSim/Data/MySQL/MySQLLogData.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -namespace OpenSim.Framework.Data.MySQL +namespace OpenSim.Data.MySQL { /// /// An interface to the log database for MySQL diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index 579667b627..3d408d0ea5 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs @@ -35,7 +35,7 @@ using libsecondlife; using MySql.Data.MySqlClient; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.MySQL +namespace OpenSim.Data.MySQL { /// /// A MySQL Database manager diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index fd640ec120..b03d1d975c 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs @@ -32,7 +32,7 @@ using System.Text.RegularExpressions; using libsecondlife; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.MySQL +namespace OpenSim.Data.MySQL { /// /// A database interface class to a user profile storage system diff --git a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs index 060e26c688..16b2a4fc1a 100644 --- a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs @@ -32,11 +32,11 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly : AssemblyTitle("OpenSim.Framework.Data.MySQL")] +[assembly : AssemblyTitle("OpenSim.Data.MySQL")] [assembly : AssemblyDescription("")] [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] -[assembly : AssemblyProduct("OpenSim.Framework.Data.MySQL")] +[assembly : AssemblyProduct("OpenSim.Data.MySQL")] [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Data/MySQLMapper/MySQLDataReader.cs b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs index 9fd50f6d0a..113e991946 100644 --- a/OpenSim/Data/MySQLMapper/MySQLDataReader.cs +++ b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Data; using System.Text; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; -namespace OpenSim.Framework.Data.MySQLMapper +namespace OpenSim.Data.MySQLMapper { public class MySQLDataReader : OpenSimDataReader { diff --git a/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs index 3f5b18ff00..16f133ad68 100644 --- a/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs +++ b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs @@ -28,10 +28,10 @@ using System.Data; using System.Data.Common; using MySql.Data.MySqlClient; -using OpenSim.Framework.Data; -using OpenSim.Framework.Data.Base; +using OpenSim.Data; +using OpenSim.Data.Base; -namespace OpenSim.Framework.Data.MySQLMapper +namespace OpenSim.Data.MySQLMapper { public class MySQLDatabaseMapper : OpenSimDatabaseConnector { diff --git a/OpenSim/Data/OpenSimDataReader.cs b/OpenSim/Data/OpenSimDataReader.cs index 538af8f982..aaf9aafe7d 100644 --- a/OpenSim/Data/OpenSimDataReader.cs +++ b/OpenSim/Data/OpenSimDataReader.cs @@ -28,9 +28,9 @@ using System; using System.Data; using libsecondlife; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public class OpenSimDataReader : BaseDataReader { diff --git a/OpenSim/Data/OpenSimDatabaseConnector.cs b/OpenSim/Data/OpenSimDatabaseConnector.cs index 809fd1eaa2..1a998a7057 100644 --- a/OpenSim/Data/OpenSimDatabaseConnector.cs +++ b/OpenSim/Data/OpenSimDatabaseConnector.cs @@ -29,9 +29,9 @@ using System.Data; using System.Data.Common; using libsecondlife; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public abstract class OpenSimDatabaseConnector : BaseDatabaseConnector { diff --git a/OpenSim/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Data/OpenSimObjectFieldMapper.cs index dfcca1bde3..72bfbb1b25 100644 --- a/OpenSim/Data/OpenSimObjectFieldMapper.cs +++ b/OpenSim/Data/OpenSimObjectFieldMapper.cs @@ -31,9 +31,9 @@ using System.Data.Common; using System.Text; using libsecondlife; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public class OpenSimObjectFieldMapper : ObjectField { diff --git a/OpenSim/Data/OpenSimTableMapper.cs b/OpenSim/Data/OpenSimTableMapper.cs index cd3d1af4e6..bf45b71e61 100644 --- a/OpenSim/Data/OpenSimTableMapper.cs +++ b/OpenSim/Data/OpenSimTableMapper.cs @@ -27,9 +27,9 @@ using System.Data; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public abstract class OpenSimTableMapper : BaseTableMapper { diff --git a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs index 51adf89435..a946fe68ef 100644 --- a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs +++ b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs @@ -27,10 +27,10 @@ using System; using OpenSim.Framework; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; using libsecondlife; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public class PrimitiveBaseShapeRowMapper : BaseRowMapper { diff --git a/OpenSim/Data/Properties/AssemblyInfo.cs b/OpenSim/Data/Properties/AssemblyInfo.cs index 7b65a09775..357aaa0df8 100644 --- a/OpenSim/Data/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/Properties/AssemblyInfo.cs @@ -32,11 +32,11 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly : AssemblyTitle("OpenSim.Framework.Data")] +[assembly : AssemblyTitle("OpenSim.Data")] [assembly : AssemblyDescription("")] [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] -[assembly : AssemblyProduct("OpenSim.Framework.Data")] +[assembly : AssemblyProduct("OpenSim.Data")] [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs index 96351e0891..540c1d4b79 100644 --- a/OpenSim/Data/RegionProfileData.cs +++ b/OpenSim/Data/RegionProfileData.cs @@ -30,7 +30,7 @@ using System.Collections; using libsecondlife; using Nwc.XmlRpc; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { /// /// A class which contains information known to the grid server about a region diff --git a/OpenSim/Data/ReservationData.cs b/OpenSim/Data/ReservationData.cs index 0c2cff320e..e28470860b 100644 --- a/OpenSim/Data/ReservationData.cs +++ b/OpenSim/Data/ReservationData.cs @@ -27,7 +27,7 @@ using libsecondlife; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public class ReservationData { diff --git a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs index 600405e106..4616cbcd79 100644 --- a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs @@ -32,11 +32,11 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly : AssemblyTitle("OpenSim.Framework.Data.SQLite")] +[assembly : AssemblyTitle("OpenSim.Data.SQLite")] [assembly : AssemblyDescription("")] [assembly : AssemblyConfiguration("")] [assembly : AssemblyCompany("")] -[assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")] +[assembly : AssemblyProduct("OpenSim.Data.SQLite")] [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] [assembly : AssemblyTrademark("")] [assembly : AssemblyCulture("")] diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index afa73b1589..c7b0984e78 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs @@ -32,7 +32,7 @@ using libsecondlife; using Mono.Data.SqliteClient; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.SQLite +namespace OpenSim.Data.SQLite { /// /// A User storage interface for the DB4o database system diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs index 94e8e50462..7575245fde 100644 --- a/OpenSim/Data/SQLite/SQLiteGridData.cs +++ b/OpenSim/Data/SQLite/SQLiteGridData.cs @@ -32,7 +32,7 @@ using System.Security.Cryptography; using System.Text; using libsecondlife; -namespace OpenSim.Framework.Data.SQLite +namespace OpenSim.Data.SQLite { /// /// A Grid Interface to the SQLite database diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index d31863f4ae..bdbb56e159 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs @@ -33,7 +33,7 @@ using libsecondlife; using Mono.Data.SqliteClient; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.SQLite +namespace OpenSim.Data.SQLite { public class SQLiteInventoryStore : SQLiteUtil, IInventoryData { diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs index b383b0d6b5..c8ba2afc23 100644 --- a/OpenSim/Data/SQLite/SQLiteManager.cs +++ b/OpenSim/Data/SQLite/SQLiteManager.cs @@ -33,7 +33,7 @@ using libsecondlife; using Mono.Data.SqliteClient; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.SQLite +namespace OpenSim.Data.SQLite { internal class SQLiteManager : SQLiteUtil { diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 77161a488a..85617e5650 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs @@ -36,7 +36,7 @@ using OpenSim.Framework.Console; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -namespace OpenSim.Framework.Data.SQLite +namespace OpenSim.Data.SQLite { public class SQLiteRegionData : IRegionDataStore { diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs index 2efd4aa57c..3c725745d4 100644 --- a/OpenSim/Data/SQLite/SQLiteUserData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserData.cs @@ -32,7 +32,7 @@ using libsecondlife; using Mono.Data.SqliteClient; using OpenSim.Framework.Console; -namespace OpenSim.Framework.Data.SQLite +namespace OpenSim.Data.SQLite { /// /// A User storage interface for the SQLite database system diff --git a/OpenSim/Data/SQLite/SQLiteUtils.cs b/OpenSim/Data/SQLite/SQLiteUtils.cs index 1334e53384..5bb22f7a7b 100644 --- a/OpenSim/Data/SQLite/SQLiteUtils.cs +++ b/OpenSim/Data/SQLite/SQLiteUtils.cs @@ -29,7 +29,7 @@ using System; using System.Data; using Mono.Data.SqliteClient; -namespace OpenSim.Framework.Data.SQLite +namespace OpenSim.Data.SQLite { /// /// A base class for methods needed by all SQLite database classes diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs index 5e0be45050..0dc721d472 100644 --- a/OpenSim/Data/UserDataBase.cs +++ b/OpenSim/Data/UserDataBase.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using libsecondlife; -namespace OpenSim.Framework.Data +namespace OpenSim.Data { public abstract class UserDataBase : IUserData {