aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSean Dague2008-04-02 15:36:01 +0000
committerSean Dague2008-04-02 15:36:01 +0000
commitf52c8f3970c5f528aaa6edf2b1bf8acc31c52313 (patch)
treeb22667e2d4ad14d6eaad11993e400b94e0f8fcb6 /OpenSim
parentfirst pass at fixing up prebuild.xml after the (diff)
downloadopensim-SC_OLD-f52c8f3970c5f528aaa6edf2b1bf8acc31c52313.zip
opensim-SC_OLD-f52c8f3970c5f528aaa6edf2b1bf8acc31c52313.tar.gz
opensim-SC_OLD-f52c8f3970c5f528aaa6edf2b1bf8acc31c52313.tar.bz2
opensim-SC_OLD-f52c8f3970c5f528aaa6edf2b1bf8acc31c52313.tar.xz
attempt to fix up all refernces to new directory structure
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/AssetDataBase.cs2
-rw-r--r--OpenSim/Data/Base/BaseDataReader.cs2
-rw-r--r--OpenSim/Data/Base/BaseDatabaseConnector.cs2
-rw-r--r--OpenSim/Data/Base/BaseFieldMapper.cs2
-rw-r--r--OpenSim/Data/Base/BaseRowMapper.cs4
-rw-r--r--OpenSim/Data/Base/BaseSchema.cs4
-rw-r--r--OpenSim/Data/Base/BaseTableMapper.cs4
-rw-r--r--OpenSim/Data/Base/Properties/AssemblyInfo.cs4
-rw-r--r--OpenSim/Data/DB4o/DB4oGridData.cs2
-rw-r--r--OpenSim/Data/DB4o/DB4oManager.cs2
-rw-r--r--OpenSim/Data/DB4o/DB4oUserData.cs2
-rw-r--r--OpenSim/Data/DB4o/Properties/AssemblyInfo.cs4
-rw-r--r--OpenSim/Data/DataStoreBase.cs2
-rw-r--r--OpenSim/Data/GridDataBase.cs2
-rw-r--r--OpenSim/Data/IGridData.cs2
-rw-r--r--OpenSim/Data/ILogData.cs2
-rw-r--r--OpenSim/Data/IniConfig.cs2
-rw-r--r--OpenSim/Data/InventoryDataBase.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLDataStore.cs6
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLInventoryData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLogData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs2
-rw-r--r--OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs4
-rw-r--r--OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs4
-rw-r--r--OpenSim/Data/MapperFactory/DataMapperFactory.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLLogData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs2
-rw-r--r--OpenSim/Data/MySQL/Properties/AssemblyInfo.cs4
-rw-r--r--OpenSim/Data/MySQLMapper/MySQLDataReader.cs4
-rw-r--r--OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs6
-rw-r--r--OpenSim/Data/OpenSimDataReader.cs4
-rw-r--r--OpenSim/Data/OpenSimDatabaseConnector.cs4
-rw-r--r--OpenSim/Data/OpenSimObjectFieldMapper.cs4
-rw-r--r--OpenSim/Data/OpenSimTableMapper.cs4
-rw-r--r--OpenSim/Data/PrimitiveBaseShapeTableMapper.cs4
-rw-r--r--OpenSim/Data/Properties/AssemblyInfo.cs4
-rw-r--r--OpenSim/Data/RegionProfileData.cs2
-rw-r--r--OpenSim/Data/ReservationData.cs2
-rw-r--r--OpenSim/Data/SQLite/Properties/AssemblyInfo.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteGridData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteManager.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteUtils.cs2
-rw-r--r--OpenSim/Data/UserDataBase.cs2
55 files changed, 78 insertions, 78 deletions
diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index 0f3044e..2b2f90d 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Data 6namespace OpenSim.Data
7{ 7{
8 public abstract class AssetDataBase : IAssetProvider 8 public abstract class AssetDataBase : IAssetProvider
9 { 9 {
diff --git a/OpenSim/Data/Base/BaseDataReader.cs b/OpenSim/Data/Base/BaseDataReader.cs
index 3baefcd..da90f10 100644
--- a/OpenSim/Data/Base/BaseDataReader.cs
+++ b/OpenSim/Data/Base/BaseDataReader.cs
@@ -29,7 +29,7 @@ using System;
29using System.Data; 29using System.Data;
30using System.IO; 30using System.IO;
31 31
32namespace OpenSim.Framework.Data.Base 32namespace OpenSim.Data.Base
33{ 33{
34 public abstract class BaseDataReader 34 public abstract class BaseDataReader
35 { 35 {
diff --git a/OpenSim/Data/Base/BaseDatabaseConnector.cs b/OpenSim/Data/Base/BaseDatabaseConnector.cs
index fa3a6c3..6988839 100644
--- a/OpenSim/Data/Base/BaseDatabaseConnector.cs
+++ b/OpenSim/Data/Base/BaseDatabaseConnector.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.Common; 31using System.Data.Common;
32 32
33namespace OpenSim.Framework.Data.Base 33namespace OpenSim.Data.Base
34{ 34{
35 public abstract class BaseDatabaseConnector 35 public abstract class BaseDatabaseConnector
36 { 36 {
diff --git a/OpenSim/Data/Base/BaseFieldMapper.cs b/OpenSim/Data/Base/BaseFieldMapper.cs
index 03c7bfb..64adb32 100644
--- a/OpenSim/Data/Base/BaseFieldMapper.cs
+++ b/OpenSim/Data/Base/BaseFieldMapper.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data.Common; 30using System.Data.Common;
31 31
32namespace OpenSim.Framework.Data.Base 32namespace OpenSim.Data.Base
33{ 33{
34 public delegate TField ObjectGetAccessor<TObj, TField>(TObj obj); 34 public delegate TField ObjectGetAccessor<TObj, TField>(TObj obj);
35 public delegate void ObjectSetAccessor<TObj, TField>(TObj obj, TField value); 35 public delegate void ObjectSetAccessor<TObj, TField>(TObj obj, TField value);
diff --git a/OpenSim/Data/Base/BaseRowMapper.cs b/OpenSim/Data/Base/BaseRowMapper.cs
index b008b86..45af15a 100644
--- a/OpenSim/Data/Base/BaseRowMapper.cs
+++ b/OpenSim/Data/Base/BaseRowMapper.cs
@@ -25,9 +25,9 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenSim.Framework.Data.Base; 28using OpenSim.Data.Base;
29 29
30namespace OpenSim.Framework.Data.Base 30namespace OpenSim.Data.Base
31{ 31{
32 public abstract class BaseRowMapper 32 public abstract class BaseRowMapper
33 { 33 {
diff --git a/OpenSim/Data/Base/BaseSchema.cs b/OpenSim/Data/Base/BaseSchema.cs
index 8a7ee71..f6bea50 100644
--- a/OpenSim/Data/Base/BaseSchema.cs
+++ b/OpenSim/Data/Base/BaseSchema.cs
@@ -26,9 +26,9 @@
26 */ 26 */
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenSim.Framework.Data.Base; 29using OpenSim.Data.Base;
30 30
31namespace OpenSim.Framework.Data.Base 31namespace OpenSim.Data.Base
32{ 32{
33 public class BaseSchema 33 public class BaseSchema
34 { 34 {
diff --git a/OpenSim/Data/Base/BaseTableMapper.cs b/OpenSim/Data/Base/BaseTableMapper.cs
index cad4823..d088769 100644
--- a/OpenSim/Data/Base/BaseTableMapper.cs
+++ b/OpenSim/Data/Base/BaseTableMapper.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using System.Data.Common; 30using System.Data.Common;
31using OpenSim.Framework.Data.Base; 31using OpenSim.Data.Base;
32 32
33namespace OpenSim.Framework.Data.Base 33namespace OpenSim.Data.Base
34{ 34{
35 public abstract class BaseTableMapper 35 public abstract class BaseTableMapper
36 { 36 {
diff --git a/OpenSim/Data/Base/Properties/AssemblyInfo.cs b/OpenSim/Data/Base/Properties/AssemblyInfo.cs
index ab97490..f851df0 100644
--- a/OpenSim/Data/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/Base/Properties/AssemblyInfo.cs
@@ -33,11 +33,11 @@ using System.Security;
33// set of attributes. Change these attribute values to modify the information 33// set of attributes. Change these attribute values to modify the information
34// associated with an assembly. 34// associated with an assembly.
35 35
36[assembly : AssemblyTitle("OpenSim.Framework.Data.Base")] 36[assembly : AssemblyTitle("OpenSim.Data.Base")]
37[assembly : AssemblyDescription("Generic Database Abstraction Layer")] 37[assembly : AssemblyDescription("Generic Database Abstraction Layer")]
38[assembly : AssemblyConfiguration("")] 38[assembly : AssemblyConfiguration("")]
39[assembly : AssemblyCompany("OpenSim Project (www.opensimulator.org)")] 39[assembly : AssemblyCompany("OpenSim Project (www.opensimulator.org)")]
40[assembly: AssemblyProduct("OpenSim.Framework.Data.Base")] 40[assembly: AssemblyProduct("OpenSim.Data.Base")]
41[assembly: AssemblyCopyright("Copyright (c) 2007 OpenSim Project (www.opensimulator.org)")] 41[assembly: AssemblyCopyright("Copyright (c) 2007 OpenSim Project (www.opensimulator.org)")]
42[assembly : AssemblyTrademark("")] 42[assembly : AssemblyTrademark("")]
43[assembly : AssemblyCulture("")] 43[assembly : AssemblyCulture("")]
diff --git a/OpenSim/Data/DB4o/DB4oGridData.cs b/OpenSim/Data/DB4o/DB4oGridData.cs
index 31b13e3..d10e7ed 100644
--- a/OpenSim/Data/DB4o/DB4oGridData.cs
+++ b/OpenSim/Data/DB4o/DB4oGridData.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31 31
32namespace OpenSim.Framework.Data.DB4o 32namespace OpenSim.Data.DB4o
33{ 33{
34 /// <summary> 34 /// <summary>
35 /// A grid server storage mechanism employing the DB4o database system 35 /// 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 9cacb5e..c767246 100644
--- a/OpenSim/Data/DB4o/DB4oManager.cs
+++ b/OpenSim/Data/DB4o/DB4oManager.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using Db4objects.Db4o; 30using Db4objects.Db4o;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.Framework.Data.DB4o 33namespace OpenSim.Data.DB4o
34{ 34{
35 /// <summary> 35 /// <summary>
36 /// A Database manager for Db4o 36 /// A Database manager for Db4o
diff --git a/OpenSim/Data/DB4o/DB4oUserData.cs b/OpenSim/Data/DB4o/DB4oUserData.cs
index 3072e81..b2b1f4d 100644
--- a/OpenSim/Data/DB4o/DB4oUserData.cs
+++ b/OpenSim/Data/DB4o/DB4oUserData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.Framework.Data.DB4o 33namespace OpenSim.Data.DB4o
34{ 34{
35 /// <summary> 35 /// <summary>
36 /// A User storage interface for the DB4o database system 36 /// 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 ee84938..5bfffd7 100644
--- a/OpenSim/Data/DB4o/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/DB4o/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
35[assembly : AssemblyTitle("OpenSim.Framework.Data.DB4o")] 35[assembly : AssemblyTitle("OpenSim.Data.DB4o")]
36[assembly : AssemblyDescription("")] 36[assembly : AssemblyDescription("")]
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OpenSim.Framework.Data.DB4o")] 39[assembly : AssemblyProduct("OpenSim.Data.DB4o")]
40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] 40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
diff --git a/OpenSim/Data/DataStoreBase.cs b/OpenSim/Data/DataStoreBase.cs
index 92604f2..1044c76 100644
--- a/OpenSim/Data/DataStoreBase.cs
+++ b/OpenSim/Data/DataStoreBase.cs
@@ -2,7 +2,7 @@
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.Framework.Data 5namespace OpenSim.Data
6{ 6{
7 public abstract class DataStoreBase 7 public abstract class DataStoreBase
8 { 8 {
diff --git a/OpenSim/Data/GridDataBase.cs b/OpenSim/Data/GridDataBase.cs
index 9d6e832..004ec9b 100644
--- a/OpenSim/Data/GridDataBase.cs
+++ b/OpenSim/Data/GridDataBase.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Data 6namespace OpenSim.Data
7{ 7{
8 public abstract class GridDataBase : IGridData 8 public abstract class GridDataBase : IGridData
9 { 9 {
diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs
index af51d0d..feb372e 100644
--- a/OpenSim/Data/IGridData.cs
+++ b/OpenSim/Data/IGridData.cs
@@ -28,7 +28,7 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using libsecondlife;
30 30
31namespace OpenSim.Framework.Data 31namespace OpenSim.Data
32{ 32{
33 public enum DataResponse 33 public enum DataResponse
34 { 34 {
diff --git a/OpenSim/Data/ILogData.cs b/OpenSim/Data/ILogData.cs
index 1751ff5..a533c87 100644
--- a/OpenSim/Data/ILogData.cs
+++ b/OpenSim/Data/ILogData.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Framework.Data 28namespace OpenSim.Data
29{ 29{
30 /// <summary> 30 /// <summary>
31 /// The severity of an individual log message 31 /// The severity of an individual log message
diff --git a/OpenSim/Data/IniConfig.cs b/OpenSim/Data/IniConfig.cs
index 47e96c8..700a681 100644
--- a/OpenSim/Data/IniConfig.cs
+++ b/OpenSim/Data/IniConfig.cs
@@ -33,7 +33,7 @@ using System.Text.RegularExpressions;
33 http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html 33 http://alexpinsker.blogspot.com/2005/12/reading-ini-file-from-c_113432097333021549.html
34 */ 34 */
35 35
36namespace OpenSim.Framework.Data 36namespace OpenSim.Data
37{ 37{
38 /// <summary> 38 /// <summary>
39 /// Parse settings from ini-like files 39 /// Parse settings from ini-like files
diff --git a/OpenSim/Data/InventoryDataBase.cs b/OpenSim/Data/InventoryDataBase.cs
index afddbf1..ff87d3c 100644
--- a/OpenSim/Data/InventoryDataBase.cs
+++ b/OpenSim/Data/InventoryDataBase.cs
@@ -2,7 +2,7 @@
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.Framework.Data 5namespace OpenSim.Data
6{ 6{
7 public abstract class InventoryDataBase 7 public abstract class InventoryDataBase
8 { 8 {
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index 059bb5e..6bae356 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -32,7 +32,7 @@ using System.Data.SqlClient;
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34 34
35namespace OpenSim.Framework.Data.MSSQL 35namespace OpenSim.Data.MSSQL
36{ 36{
37 internal class MSSQLAssetData : AssetDataBase 37 internal class MSSQLAssetData : AssetDataBase
38 { 38 {
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index d34abe3..525eeca 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -33,12 +33,12 @@ using System.IO;
33using libsecondlife; 33using libsecondlife;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Data; 36using OpenSim.Data;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
39using OpenSim.Framework.Data.MSSQL; 39using OpenSim.Data.MSSQL;
40 40
41namespace OpenSim.Framework.Data.MSSQL 41namespace OpenSim.Data.MSSQL
42{ 42{
43 public class MSSQLDataStore : IRegionDataStore 43 public class MSSQLDataStore : IRegionDataStore
44 { 44 {
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 9bd8acc..03af53c 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -33,7 +33,7 @@ using System.Text;
33using libsecondlife; 33using libsecondlife;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35 35
36namespace OpenSim.Framework.Data.MSSQL 36namespace OpenSim.Data.MSSQL
37{ 37{
38 /// <summary> 38 /// <summary>
39 /// A grid data interface for Microsoft SQL Server 39 /// A grid data interface for Microsoft SQL Server
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 1e99e51..28d787e 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -32,7 +32,7 @@ using System.Data.SqlClient;
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34 34
35namespace OpenSim.Framework.Data.MSSQL 35namespace OpenSim.Data.MSSQL
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// A MySQL interface for the inventory server 38 /// A MySQL interface for the inventory server
diff --git a/OpenSim/Data/MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs
index c76af53..2bb5839 100644
--- a/OpenSim/Data/MSSQL/MSSQLLogData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLogData.cs
@@ -28,7 +28,7 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Data; 29using System.Data;
30 30
31namespace OpenSim.Framework.Data.MSSQL 31namespace OpenSim.Data.MSSQL
32{ 32{
33 /// <summary> 33 /// <summary>
34 /// An interface to the log database for MySQL 34 /// An interface to the log database for MySQL
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index efe62be..16f0f9f 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -34,7 +34,7 @@ using System.Reflection;
34using libsecondlife; 34using libsecondlife;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36 36
37namespace OpenSim.Framework.Data.MSSQL 37namespace OpenSim.Data.MSSQL
38{ 38{
39 /// <summary> 39 /// <summary>
40 /// A management class for the MS SQL Storage Engine 40 /// A management class for the MS SQL Storage Engine
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index be0417d..3f58939 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -32,7 +32,7 @@ using System.Data.SqlClient;
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34 34
35namespace OpenSim.Framework.Data.MSSQL 35namespace OpenSim.Data.MSSQL
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// A database interface class to a user profile storage system 38 /// 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 f6ac328..6b2c214 100644
--- a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
35[assembly : AssemblyTitle("OpenSim.Framework.Data.MSSQL")] 35[assembly : AssemblyTitle("OpenSim.Data.MSSQL")]
36[assembly : AssemblyDescription("")] 36[assembly : AssemblyDescription("")]
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OpenSim.Framework.Data.MSSQL")] 39[assembly : AssemblyProduct("OpenSim.Data.MSSQL")]
40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] 40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
diff --git a/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
index 81f9631..25ea1b4 100644
--- a/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
+++ b/OpenSim/Data/MSSQLMapper/MSSQLDatabaseMapper.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Data.Common; 29using System.Data.Common;
30using System.Data.SqlClient; 30using System.Data.SqlClient;
31using OpenSim.Framework.Data; 31using OpenSim.Data;
32 32
33namespace OpenSim.Framework.Data.MSSQLMapper 33namespace OpenSim.Data.MSSQLMapper
34{ 34{
35 public class MSSQLDatabaseMapper : OpenSimDatabaseConnector 35 public class MSSQLDatabaseMapper : OpenSimDatabaseConnector
36 { 36 {
diff --git a/OpenSim/Data/MapperFactory/DataMapperFactory.cs b/OpenSim/Data/MapperFactory/DataMapperFactory.cs
index 8995b9e..79c85f8 100644
--- a/OpenSim/Data/MapperFactory/DataMapperFactory.cs
+++ b/OpenSim/Data/MapperFactory/DataMapperFactory.cs
@@ -1,9 +1,9 @@
1using System; 1using System;
2using OpenSim.Framework.Data.Base; 2using OpenSim.Data.Base;
3using OpenSim.Framework.Data.MSSQLMapper; 3using OpenSim.Data.MSSQLMapper;
4using OpenSim.Framework.Data.MySQLMapper; 4using OpenSim.Data.MySQLMapper;
5 5
6namespace OpenSim.Framework.Data.MapperFactory 6namespace OpenSim.Data.MapperFactory
7{ 7{
8 public class DataMapperFactory 8 public class DataMapperFactory
9 { 9 {
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 79994ae..d5f7816 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -32,7 +32,7 @@ using libsecondlife;
32using MySql.Data.MySqlClient; 32using MySql.Data.MySqlClient;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34 34
35namespace OpenSim.Framework.Data.MySQL 35namespace OpenSim.Data.MySQL
36{ 36{
37 internal class MySQLAssetData : AssetDataBase, IPlugin 37 internal class MySQLAssetData : AssetDataBase, IPlugin
38 { 38 {
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index eaa7f14..0d9fb3b 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Console;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Environment.Scenes;
38 38
39namespace OpenSim.Framework.Data.MySQL 39namespace OpenSim.Data.MySQL
40{ 40{
41 public class MySQLDataStore : IRegionDataStore 41 public class MySQLDataStore : IRegionDataStore
42 { 42 {
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 61ab067..610dfaf 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -34,7 +34,7 @@ using System.Text.RegularExpressions;
34using libsecondlife; 34using libsecondlife;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36 36
37namespace OpenSim.Framework.Data.MySQL 37namespace OpenSim.Data.MySQL
38{ 38{
39 /// <summary> 39 /// <summary>
40 /// A MySQL Interface for the Grid Server 40 /// A MySQL Interface for the Grid Server
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 4165d8f..326bf60 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -31,7 +31,7 @@ using libsecondlife;
31using MySql.Data.MySqlClient; 31using MySql.Data.MySqlClient;
32using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
33 33
34namespace OpenSim.Framework.Data.MySQL 34namespace OpenSim.Data.MySQL
35{ 35{
36 /// <summary> 36 /// <summary>
37 /// A MySQL interface for the inventory server 37 /// A MySQL interface for the inventory server
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index 480446f..bb34d34 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28namespace OpenSim.Framework.Data.MySQL 28namespace OpenSim.Data.MySQL
29{ 29{
30 /// <summary> 30 /// <summary>
31 /// An interface to the log database for MySQL 31 /// An interface to the log database for MySQL
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index 579667b..3d408d0 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -35,7 +35,7 @@ using libsecondlife;
35using MySql.Data.MySqlClient; 35using MySql.Data.MySqlClient;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37 37
38namespace OpenSim.Framework.Data.MySQL 38namespace OpenSim.Data.MySQL
39{ 39{
40 /// <summary> 40 /// <summary>
41 /// A MySQL Database manager 41 /// A MySQL Database manager
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index fd640ec..b03d1d9 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -32,7 +32,7 @@ using System.Text.RegularExpressions;
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34 34
35namespace OpenSim.Framework.Data.MySQL 35namespace OpenSim.Data.MySQL
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// A database interface class to a user profile storage system 38 /// 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 060e26c..16b2a4f 100644
--- a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
35[assembly : AssemblyTitle("OpenSim.Framework.Data.MySQL")] 35[assembly : AssemblyTitle("OpenSim.Data.MySQL")]
36[assembly : AssemblyDescription("")] 36[assembly : AssemblyDescription("")]
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OpenSim.Framework.Data.MySQL")] 39[assembly : AssemblyProduct("OpenSim.Data.MySQL")]
40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] 40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
diff --git a/OpenSim/Data/MySQLMapper/MySQLDataReader.cs b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs
index 9fd50f6..113e991 100644
--- a/OpenSim/Data/MySQLMapper/MySQLDataReader.cs
+++ b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs
@@ -2,9 +2,9 @@
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Data; 3using System.Data;
4using System.Text; 4using System.Text;
5using OpenSim.Framework.Data.Base; 5using OpenSim.Data.Base;
6 6
7namespace OpenSim.Framework.Data.MySQLMapper 7namespace OpenSim.Data.MySQLMapper
8{ 8{
9 public class MySQLDataReader : OpenSimDataReader 9 public class MySQLDataReader : OpenSimDataReader
10 { 10 {
diff --git a/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
index 3f5b18f..16f133a 100644
--- a/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
+++ b/OpenSim/Data/MySQLMapper/MySQLDatabaseMapper.cs
@@ -28,10 +28,10 @@
28using System.Data; 28using System.Data;
29using System.Data.Common; 29using System.Data.Common;
30using MySql.Data.MySqlClient; 30using MySql.Data.MySqlClient;
31using OpenSim.Framework.Data; 31using OpenSim.Data;
32using OpenSim.Framework.Data.Base; 32using OpenSim.Data.Base;
33 33
34namespace OpenSim.Framework.Data.MySQLMapper 34namespace OpenSim.Data.MySQLMapper
35{ 35{
36 public class MySQLDatabaseMapper : OpenSimDatabaseConnector 36 public class MySQLDatabaseMapper : OpenSimDatabaseConnector
37 { 37 {
diff --git a/OpenSim/Data/OpenSimDataReader.cs b/OpenSim/Data/OpenSimDataReader.cs
index 538af8f..aaf9aaf 100644
--- a/OpenSim/Data/OpenSimDataReader.cs
+++ b/OpenSim/Data/OpenSimDataReader.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework.Data.Base; 31using OpenSim.Data.Base;
32 32
33namespace OpenSim.Framework.Data 33namespace OpenSim.Data
34{ 34{
35 public class OpenSimDataReader : BaseDataReader 35 public class OpenSimDataReader : BaseDataReader
36 { 36 {
diff --git a/OpenSim/Data/OpenSimDatabaseConnector.cs b/OpenSim/Data/OpenSimDatabaseConnector.cs
index 809fd1e..1a998a7 100644
--- a/OpenSim/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Data/OpenSimDatabaseConnector.cs
@@ -29,9 +29,9 @@ using System.Data;
29using System.Data.Common; 29using System.Data.Common;
30using libsecondlife; 30using libsecondlife;
31 31
32using OpenSim.Framework.Data.Base; 32using OpenSim.Data.Base;
33 33
34namespace OpenSim.Framework.Data 34namespace OpenSim.Data
35{ 35{
36 public abstract class OpenSimDatabaseConnector : BaseDatabaseConnector 36 public abstract class OpenSimDatabaseConnector : BaseDatabaseConnector
37 { 37 {
diff --git a/OpenSim/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Data/OpenSimObjectFieldMapper.cs
index dfcca1b..72bfbb1 100644
--- a/OpenSim/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Data/OpenSimObjectFieldMapper.cs
@@ -31,9 +31,9 @@ using System.Data.Common;
31using System.Text; 31using System.Text;
32using libsecondlife; 32using libsecondlife;
33 33
34using OpenSim.Framework.Data.Base; 34using OpenSim.Data.Base;
35 35
36namespace OpenSim.Framework.Data 36namespace OpenSim.Data
37{ 37{
38 public class OpenSimObjectFieldMapper<TObject, TField> : ObjectField<TObject, TField> 38 public class OpenSimObjectFieldMapper<TObject, TField> : ObjectField<TObject, TField>
39 { 39 {
diff --git a/OpenSim/Data/OpenSimTableMapper.cs b/OpenSim/Data/OpenSimTableMapper.cs
index cd3d1af..bf45b71 100644
--- a/OpenSim/Data/OpenSimTableMapper.cs
+++ b/OpenSim/Data/OpenSimTableMapper.cs
@@ -27,9 +27,9 @@
27 27
28using System.Data; 28using System.Data;
29 29
30using OpenSim.Framework.Data.Base; 30using OpenSim.Data.Base;
31 31
32namespace OpenSim.Framework.Data 32namespace OpenSim.Data
33{ 33{
34 public abstract class OpenSimTableMapper<TRowMapper, TPrimaryKey> : BaseTableMapper<TRowMapper, TPrimaryKey> 34 public abstract class OpenSimTableMapper<TRowMapper, TPrimaryKey> : BaseTableMapper<TRowMapper, TPrimaryKey>
35 { 35 {
diff --git a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
index 51adf89..a946fe6 100644
--- a/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
+++ b/OpenSim/Data/PrimitiveBaseShapeTableMapper.cs
@@ -27,10 +27,10 @@
27 27
28using System; 28using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Framework.Data.Base; 30using OpenSim.Data.Base;
31using libsecondlife; 31using libsecondlife;
32 32
33namespace OpenSim.Framework.Data 33namespace OpenSim.Data
34{ 34{
35 public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape> 35 public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape>
36 { 36 {
diff --git a/OpenSim/Data/Properties/AssemblyInfo.cs b/OpenSim/Data/Properties/AssemblyInfo.cs
index 7b65a09..357aaa0 100644
--- a/OpenSim/Data/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
35[assembly : AssemblyTitle("OpenSim.Framework.Data")] 35[assembly : AssemblyTitle("OpenSim.Data")]
36[assembly : AssemblyDescription("")] 36[assembly : AssemblyDescription("")]
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OpenSim.Framework.Data")] 39[assembly : AssemblyProduct("OpenSim.Data")]
40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] 40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 96351e0..540c1d4 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -30,7 +30,7 @@ using System.Collections;
30using libsecondlife; 30using libsecondlife;
31using Nwc.XmlRpc; 31using Nwc.XmlRpc;
32 32
33namespace OpenSim.Framework.Data 33namespace OpenSim.Data
34{ 34{
35 /// <summary> 35 /// <summary>
36 /// A class which contains information known to the grid server about a region 36 /// 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 0c2cff3..e284708 100644
--- a/OpenSim/Data/ReservationData.cs
+++ b/OpenSim/Data/ReservationData.cs
@@ -27,7 +27,7 @@
27 27
28using libsecondlife; 28using libsecondlife;
29 29
30namespace OpenSim.Framework.Data 30namespace OpenSim.Data
31{ 31{
32 public class ReservationData 32 public class ReservationData
33 { 33 {
diff --git a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
index 600405e..4616cbc 100644
--- a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
32// set of attributes. Change these attribute values to modify the information 32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly. 33// associated with an assembly.
34 34
35[assembly : AssemblyTitle("OpenSim.Framework.Data.SQLite")] 35[assembly : AssemblyTitle("OpenSim.Data.SQLite")]
36[assembly : AssemblyDescription("")] 36[assembly : AssemblyDescription("")]
37[assembly : AssemblyConfiguration("")] 37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("")] 38[assembly : AssemblyCompany("")]
39[assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")] 39[assembly : AssemblyProduct("OpenSim.Data.SQLite")]
40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")] 40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2008")]
41[assembly : AssemblyTrademark("")] 41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")] 42[assembly : AssemblyCulture("")]
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index afa73b1..c7b0984 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -32,7 +32,7 @@ using libsecondlife;
32using Mono.Data.SqliteClient; 32using Mono.Data.SqliteClient;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34 34
35namespace OpenSim.Framework.Data.SQLite 35namespace OpenSim.Data.SQLite
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// A User storage interface for the DB4o database system 38 /// A User storage interface for the DB4o database system
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 94e8e50..7575245 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -32,7 +32,7 @@ using System.Security.Cryptography;
32using System.Text; 32using System.Text;
33using libsecondlife; 33using libsecondlife;
34 34
35namespace OpenSim.Framework.Data.SQLite 35namespace OpenSim.Data.SQLite
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// A Grid Interface to the SQLite database 38 /// A Grid Interface to the SQLite database
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index d31863f..bdbb56e 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -33,7 +33,7 @@ using libsecondlife;
33using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35 35
36namespace OpenSim.Framework.Data.SQLite 36namespace OpenSim.Data.SQLite
37{ 37{
38 public class SQLiteInventoryStore : SQLiteUtil, IInventoryData 38 public class SQLiteInventoryStore : SQLiteUtil, IInventoryData
39 { 39 {
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index b383b0d..c8ba2af 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -33,7 +33,7 @@ using libsecondlife;
33using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35 35
36namespace OpenSim.Framework.Data.SQLite 36namespace OpenSim.Data.SQLite
37{ 37{
38 internal class SQLiteManager : SQLiteUtil 38 internal class SQLiteManager : SQLiteUtil
39 { 39 {
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 77161a4..85617e5 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Console;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Environment.Scenes;
38 38
39namespace OpenSim.Framework.Data.SQLite 39namespace OpenSim.Data.SQLite
40{ 40{
41 public class SQLiteRegionData : IRegionDataStore 41 public class SQLiteRegionData : IRegionDataStore
42 { 42 {
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 2efd4aa..3c72574 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -32,7 +32,7 @@ using libsecondlife;
32using Mono.Data.SqliteClient; 32using Mono.Data.SqliteClient;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34 34
35namespace OpenSim.Framework.Data.SQLite 35namespace OpenSim.Data.SQLite
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// A User storage interface for the SQLite database system 38 /// A User storage interface for the SQLite database system
diff --git a/OpenSim/Data/SQLite/SQLiteUtils.cs b/OpenSim/Data/SQLite/SQLiteUtils.cs
index 1334e53..5bb22f7 100644
--- a/OpenSim/Data/SQLite/SQLiteUtils.cs
+++ b/OpenSim/Data/SQLite/SQLiteUtils.cs
@@ -29,7 +29,7 @@ using System;
29using System.Data; 29using System.Data;
30using Mono.Data.SqliteClient; 30using Mono.Data.SqliteClient;
31 31
32namespace OpenSim.Framework.Data.SQLite 32namespace OpenSim.Data.SQLite
33{ 33{
34 /// <summary> 34 /// <summary>
35 /// A base class for methods needed by all SQLite database classes 35 /// A base class for methods needed by all SQLite database classes
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 5e0be45..0dc721d 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -1,7 +1,7 @@
1using System.Collections.Generic; 1using System.Collections.Generic;
2using libsecondlife; 2using libsecondlife;
3 3
4namespace OpenSim.Framework.Data 4namespace OpenSim.Data
5{ 5{
6 public abstract class UserDataBase : IUserData 6 public abstract class UserDataBase : IUserData
7 { 7 {