aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorDr Scofield2009-02-06 16:55:34 +0000
committerDr Scofield2009-02-06 16:55:34 +0000
commit9b66108081a8c8cf79faaa6c541554091c40850e (patch)
tree095a232ae5a9de3a9244bcd34da08294f61eeea5 /OpenSim/Data
parent* removed superfluous constants class (diff)
downloadopensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.zip
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.gz
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.bz2
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.xz
This changeset is the step 1 of 2 in refactoring
OpenSim.Region.Environment into a "framework" part and a modules only part. This first changeset refactors OpenSim.Region.Environment.Scenes, OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region modules in OpenSim.Region.Environment. The next step will be to move region modules up from OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and then sort out which modules are really core modules and which should move out to forge. I've been very careful to NOT BREAK anything. i hope i've succeeded. as this is the work of a whole week i hope i managed to keep track with the applied patches of the last week --- could any of you that did check in stuff have a look at whether it survived? thx!
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLEstateData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs4
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs2
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLGridTest.cs2
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs2
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs2
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLUserTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs6
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs2
-rw-r--r--OpenSim/Data/Null/NullDataStore.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs4
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs2
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs2
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs2
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs2
-rw-r--r--OpenSim/Data/Tests/BasicAssetTest.cs2
-rw-r--r--OpenSim/Data/Tests/BasicGridTest.cs2
-rw-r--r--OpenSim/Data/Tests/BasicInventoryTest.cs2
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs4
-rw-r--r--OpenSim/Data/Tests/BasicUserTest.cs2
37 files changed, 46 insertions, 46 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 56855f6..8fd47a0 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -33,7 +33,7 @@ using System.Reflection;
33using OpenMetaverse; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37 37
38namespace OpenSim.Data.MSSQL 38namespace OpenSim.Data.MSSQL
39{ 39{
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 2388207..d77afc9 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -35,8 +35,8 @@ using System.Reflection;
35using OpenMetaverse; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Data.MSSQL 41namespace OpenSim.Data.MSSQL
42{ 42{
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 57151b3..f811d84 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -35,8 +35,8 @@ using OpenMetaverse;
35using log4net; 35using log4net;
36using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Data.MySQL 41namespace OpenSim.Data.MySQL
42{ 42{
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index e1ddb54..ab55ba5 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -36,8 +36,8 @@ using OpenMetaverse;
36using log4net; 36using log4net;
37using MySql.Data.MySqlClient; 37using MySql.Data.MySqlClient;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Data.MySQL 42namespace OpenSim.Data.MySQL
43{ 43{
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
index 0419e21..0f7c9cd 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL; 35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.MySQL.Tests 39namespace OpenSim.Data.MySQL.Tests
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
index e6df085..4638bca 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL; 35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.MySQL.Tests 39namespace OpenSim.Data.MySQL.Tests
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index 6f95c6c..8c7d820 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL; 35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39 39
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index aed4cea..71e73c2 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL; 35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.MySQL.Tests 39namespace OpenSim.Data.MySQL.Tests
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
index c036f6c..8448dd7 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.MySQL; 35using OpenSim.Data.MySQL;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.MySQL.Tests 39namespace OpenSim.Data.MySQL.Tests
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index b8b1863..29f4106 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -36,9 +36,9 @@ using log4net;
36using NHibernate; 36using NHibernate;
37using NHibernate.Criterion; 37using NHibernate.Criterion;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using Environment=NHibernate.Cfg.Environment; 41using Environment = NHibernate.Cfg.Environment;
42 42
43namespace OpenSim.Data.NHibernate 43namespace OpenSim.Data.NHibernate
44{ 44{
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
index b08bed9..d6c7f8f 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
index 01d3266..e70b32b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
@@ -32,7 +32,7 @@ using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Data.NHibernate; 37using OpenSim.Data.NHibernate;
38 38
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
index 2754fe1..7500574 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39 39
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
index 19d8a37..add8883 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
index d796bde..01b0236 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
index 9a47a0f..93b92ed 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
index 0abb8ee..c845d2c 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
@@ -32,7 +32,7 @@ using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Data.NHibernate; 37using OpenSim.Data.NHibernate;
38 38
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
index bea6c7d..f91d058 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39 39
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
index 6e09f2a..4db8375 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
index df6a512..3bc0f4b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
index a5aa649..77bbb08 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
index a7a0c93..6e7d7af 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
@@ -32,7 +32,7 @@ using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Data.NHibernate; 37using OpenSim.Data.NHibernate;
38 38
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
index 23c1ec7..45c77f7 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39 39
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
index 9e77d47..6e84110 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
index 1e8ba3c..90edbc2 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate; 35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.NHibernate.Tests 39namespace OpenSim.Data.NHibernate.Tests
diff --git a/OpenSim/Data/Null/NullDataStore.cs b/OpenSim/Data/Null/NullDataStore.cs
index 94ad4af..9b1c0e2 100644
--- a/OpenSim/Data/Null/NullDataStore.cs
+++ b/OpenSim/Data/Null/NullDataStore.cs
@@ -28,8 +28,8 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Framework.Scenes;
33 33
34namespace OpenSim.Data.Null 34namespace OpenSim.Data.Null
35{ 35{
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index f95932d..46d29a3 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -35,8 +35,8 @@ using OpenMetaverse;
35using Mono.Data.SqliteClient; 35using Mono.Data.SqliteClient;
36using log4net; 36using log4net;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Data.SQLite 41namespace OpenSim.Data.SQLite
42{ 42{
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 306dcb8..89308db 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -36,8 +36,8 @@ using OpenMetaverse;
36using log4net; 36using log4net;
37using Mono.Data.SqliteClient; 37using Mono.Data.SqliteClient;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Environment.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Data.SQLite 42namespace OpenSim.Data.SQLite
43{ 43{
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index 993f5f5..0de965d 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite; 35using OpenSim.Data.SQLite;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.SQLite.Tests 39namespace OpenSim.Data.SQLite.Tests
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 571aa85..07b0dab 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite; 35using OpenSim.Data.SQLite;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38using log4net;
39 39
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index b188ead..86a1192 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite; 35using OpenSim.Data.SQLite;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.SQLite.Tests 39namespace OpenSim.Data.SQLite.Tests
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index 68a10fb..0415219 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -33,7 +33,7 @@ using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Data.Tests; 34using OpenSim.Data.Tests;
35using OpenSim.Data.SQLite; 35using OpenSim.Data.SQLite;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse; 37using OpenMetaverse;
38 38
39namespace OpenSim.Data.SQLite.Tests 39namespace OpenSim.Data.SQLite.Tests
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 5993f96..10cd35f 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -31,7 +31,7 @@ using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenSim.Data; 32using OpenSim.Data;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse; 35using OpenMetaverse;
36 36
37namespace OpenSim.Data.Tests 37namespace OpenSim.Data.Tests
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
index b9cf4cf..adf3879 100644
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -32,7 +32,7 @@ using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers; 32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Data; 33using OpenSim.Data;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse; 36using OpenMetaverse;
37 37
38namespace OpenSim.Data.Tests 38namespace OpenSim.Data.Tests
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index 2e6226f..1e13ec4 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -31,7 +31,7 @@ using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Data; 33using OpenSim.Data;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse; 35using OpenMetaverse;
36 36
37namespace OpenSim.Data.Tests 37namespace OpenSim.Data.Tests
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index a0591fa..70d8f8a 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -33,8 +33,8 @@ using NUnit.Framework;
33using NUnit.Framework.SyntaxHelpers; 33using NUnit.Framework.SyntaxHelpers;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Data; 35using OpenSim.Data;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Environment.Modules.World.Land; 38using OpenSim.Region.Environment.Modules.World.Land;
39using OpenMetaverse; 39using OpenMetaverse;
40 40
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index e7e6b84..5464ade 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -34,7 +34,7 @@ using NUnit.Framework;
34using NUnit.Framework.SyntaxHelpers; 34using NUnit.Framework.SyntaxHelpers;
35using OpenSim.Data; 35using OpenSim.Data;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenMetaverse; 38using OpenMetaverse;
39 39
40namespace OpenSim.Data.Tests 40namespace OpenSim.Data.Tests