16 files changed, 18 insertions, 18 deletions

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;
 using NHibernate;
 using NHibernate.Criterion;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
-using Environment=NHibernate.Cfg.Environment;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using Environment = NHibernate.Cfg.Environment;
 
 namespace OpenSim.Data.NHibernate
 {
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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
 namespace 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;
 using NUnit.Framework.SyntaxHelpers;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 using OpenSim.Data.NHibernate;
 
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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 using log4net;
 
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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
 namespace 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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
 namespace 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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
 namespace 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;
 using NUnit.Framework.SyntaxHelpers;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 using OpenSim.Data.NHibernate;
 
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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 using log4net;
 
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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
 namespace 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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
 namespace 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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
 namespace 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;
 using NUnit.Framework.SyntaxHelpers;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 using OpenSim.Data.NHibernate;
 
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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 using log4net;
 
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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
 namespace 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;
 using OpenSim.Framework;
 using OpenSim.Data.Tests;
 using OpenSim.Data.NHibernate;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
 namespace OpenSim.Data.NHibernate.Tests