aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSean Dague2008-04-02 15:38:44 +0000
committerSean Dague2008-04-02 15:38:44 +0000
commit86cf07f1c40b82b3f90bb7275444f522f14fbc9d (patch)
tree6d5b20aed04bbd92fd1db79fe628904f848b70cf /OpenSim
parentattempt to fix up all refernces to new directory structure (diff)
downloadopensim-SC_OLD-86cf07f1c40b82b3f90bb7275444f522f14fbc9d.zip
opensim-SC_OLD-86cf07f1c40b82b3f90bb7275444f522f14fbc9d.tar.gz
opensim-SC_OLD-86cf07f1c40b82b3f90bb7275444f522f14fbc9d.tar.bz2
opensim-SC_OLD-86cf07f1c40b82b3f90bb7275444f522f14fbc9d.tar.xz
changing more references to OpenSim.Data
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AssetConfig.cs2
-rw-r--r--OpenSim/Framework/GridConfig.cs2
-rw-r--r--OpenSim/Framework/InventoryConfig.cs2
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs2
-rw-r--r--OpenSim/Framework/UserConfig.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs10
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceInformer.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/UserPresenceData.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs20
-rw-r--r--OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs4
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs2
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs4
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs2
-rw-r--r--OpenSim/Tests/Inventory/TestInventory.cs6
17 files changed, 34 insertions, 34 deletions
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 4074595..8a4ce92 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
58 "Default Startup Message", "Welcome to OGS", false); 58 "Default Startup Message", "Welcome to OGS", false);
59 59
60 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 60 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
61 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 61 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
62 62
63 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 63 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
64 "Http Listener port", DefaultHttpPort.ToString(), false); 64 "Http Listener port", DefaultHttpPort.ToString(), false);
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index d850c20..9519f17 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework
90 configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 90 configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
91 "Key to expect from a simulator", "null", false); 91 "Key to expect from a simulator", "null", false);
92 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 92 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
93 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 93 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
94 94
95 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 95 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
96 "Http Listener port", DefaultHttpPort.ToString(), false); 96 "Http Listener port", DefaultHttpPort.ToString(), false);
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index df1e90b..7136efa 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework
67 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 67 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
68 "Key to expect from user server", "null", false); 68 "Key to expect from user server", "null", false);
69 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 69 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
70 "DLL for database provider", "OpenSim.Framework.Data.SQLite.dll", false); 70 "DLL for database provider", "OpenSim.Data.SQLite.dll", false);
71 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 71 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
72 "Http Listener port", DefaultHttpPort.ToString(), false); 72 "Http Listener port", DefaultHttpPort.ToString(), false);
73 } 73 }
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index b903e80..f15efa6 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Framework
84 "Key to expect from user server", "null", false); 84 "Key to expect from user server", "null", false);
85 85
86 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 86 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
87 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 87 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
88 88
89 configMember.addConfigurationOption("region_comms_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 89 configMember.addConfigurationOption("region_comms_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
90 "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false); 90 "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false);
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 13c7bec..8335bba 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Framework
81 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString() + "/", 81 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString() + "/",
82 false); 82 false);
83 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 83 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
84 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 84 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
85 85
86 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 86 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
87 "Http Listener port", DefaultHttpPort.ToString(), false); 87 "Http Listener port", DefaultHttpPort.ToString(), false);
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index e9027ba..5ca8cf7 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -34,9 +34,9 @@ using libsecondlife;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Data; 37using OpenSim.Data;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Data.MySQL; 39using OpenSim.Data.MySQL;
40 40
41namespace OpenSim.Grid.GridServer 41namespace OpenSim.Grid.GridServer
42{ 42{
@@ -602,10 +602,10 @@ namespace OpenSim.Grid.GridServer
602 602
603 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 603 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
604 { 604 {
605 //OpenSim.Framework.Data.MySQL.MySQLGridData dbengine = new OpenSim.Framework.Data.MySQL.MySQLGridData(); 605 //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData();
606 try 606 try
607 { 607 {
608 OpenSim.Framework.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Framework.Data.MySQL.MySQLGridData)(kvp.Value); 608 OpenSim.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Data.MySQL.MySQLGridData)(kvp.Value);
609 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim); 609 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim);
610 DataResponse insertResponse = mysqldata.DeleteProfile(uuid); 610 DataResponse insertResponse = mysqldata.DeleteProfile(uuid);
611 switch (insertResponse) 611 switch (insertResponse)
@@ -720,7 +720,7 @@ namespace OpenSim.Grid.GridServer
720 IList simProfileList = new ArrayList(); 720 IList simProfileList = new ArrayList();
721 721
722 bool fastMode = false; // MySQL Only 722 bool fastMode = false; // MySQL Only
723 fastMode = (Config.DatabaseProvider == "OpenSim.Framework.Data.MySQL.dll"); 723 fastMode = (Config.DatabaseProvider == "OpenSim.Data.MySQL.dll");
724 724
725 if (fastMode) 725 if (fastMode)
726 { 726 {
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index c4e8a58..1b16cb2 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -36,7 +36,7 @@ using libsecondlife;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
39using OpenSim.Framework.Data; 39using OpenSim.Data;
40using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
41using FriendRights = libsecondlife.FriendRights; 41using FriendRights = libsecondlife.FriendRights;
42 42
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index 9e8b230..f270bbe 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -35,7 +35,7 @@ using libsecondlife;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Framework.Data; 38using OpenSim.Data;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40 40
41namespace OpenSim.Grid.MessagingServer 41namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
index a95083e..4390903 100644
--- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs
+++ b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
@@ -30,7 +30,7 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Data; 33using OpenSim.Data;
34 34
35namespace OpenSim.Grid.MessagingServer 35namespace OpenSim.Grid.MessagingServer
36{ 36{
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 7917118..5fad88a 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -35,7 +35,7 @@ using Nwc.XmlRpc;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Framework.Data; 38using OpenSim.Data;
39using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
40using OpenSim.Framework.Statistics; 40using OpenSim.Framework.Statistics;
41using OpenSim.Framework.UserManagement; 41using OpenSim.Framework.UserManagement;
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 9f1ad88..be2aafd 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -191,7 +191,7 @@ namespace OpenSim
191 config.Set("physical_prim", true); 191 config.Set("physical_prim", true);
192 config.Set("see_into_this_sim_from_neighbor", true); 192 config.Set("see_into_this_sim_from_neighbor", true);
193 config.Set("serverside_object_permissions", false); 193 config.Set("serverside_object_permissions", false);
194 config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); 194 config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
195 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); 195 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
196 config.Set("storage_prim_inventories", true); 196 config.Set("storage_prim_inventories", true);
197 config.Set("startup_console_commands_file", String.Empty); 197 config.Set("startup_console_commands_file", String.Empty);
@@ -208,9 +208,9 @@ namespace OpenSim
208 { 208 {
209 config.Set("accounts_authenticate", false); 209 config.Set("accounts_authenticate", false);
210 config.Set("welcome_message", "Welcome to OpenSim"); 210 config.Set("welcome_message", "Welcome to OpenSim");
211 config.Set("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); 211 config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
212 config.Set("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll"); 212 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
213 config.Set("asset_plugin", "OpenSim.Framework.Data.SQLite.dll"); 213 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
214 config.Set("dump_assets_to_file", false); 214 config.Set("dump_assets_to_file", false);
215 } 215 }
216 216
@@ -270,11 +270,11 @@ namespace OpenSim
270 270
271 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); 271 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false);
272 272
273 m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); 273 m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Data.SQLite.dll");
274 if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll") 274 if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll")
275 { 275 {
276 m_storageDll = "OpenSim.Framework.Data.SQLite.dll"; 276 m_storageDll = "OpenSim.Data.SQLite.dll";
277 Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Framework.Data.SQLite.dll."); 277 Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
278 Thread.Sleep(3000); 278 Thread.Sleep(3000);
279 } 279 }
280 m_storageConnectionString 280 m_storageConnectionString
@@ -297,11 +297,11 @@ namespace OpenSim
297 m_standaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", false); 297 m_standaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", false);
298 m_standaloneWelcomeMessage = standaloneConfig.GetString("welcome_message", "Welcome to OpenSim"); 298 m_standaloneWelcomeMessage = standaloneConfig.GetString("welcome_message", "Welcome to OpenSim");
299 m_standaloneInventoryPlugin = 299 m_standaloneInventoryPlugin =
300 standaloneConfig.GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); 300 standaloneConfig.GetString("inventory_plugin", "OpenSim.Data.SQLite.dll");
301 m_standaloneUserPlugin = 301 m_standaloneUserPlugin =
302 standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll"); 302 standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
303 m_standaloneAssetPlugin = 303 m_standaloneAssetPlugin =
304 standaloneConfig.GetString("asset_plugin", "OpenSim.Framework.Data.SQLite.dll"); 304 standaloneConfig.GetString("asset_plugin", "OpenSim.Data.SQLite.dll");
305 305
306 m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); 306 m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false);
307 } 307 }
diff --git a/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs b/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
index cdbd6a0..5353952 100644
--- a/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
+++ b/OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Data.Base; 33using OpenSim.Data.Base;
34 34
35namespace OpenSim.Region.Environment.Modules 35namespace OpenSim.Region.Environment.Modules
36{ 36{
diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index 59490ba..cb94021 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -33,10 +33,10 @@ using libsecondlife;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Framework.Data.MySQLMapper; 36using OpenSim.Data.MySQLMapper;
37using OpenSim.Region.Environment.Interfaces; 37using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 38using OpenSim.Region.Environment.Scenes;
39using OpenSim.Framework.Data.Base; 39using OpenSim.Data.Base;
40 40
41namespace OpenSim.Region.Environment.Modules 41namespace OpenSim.Region.Environment.Modules
42{ 42{
diff --git a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
index 579ee01..d6ef1fb 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Data.Base; 33using OpenSim.Data.Base;
34 34
35namespace OpenSim.Region.Modules.AvatarFactory 35namespace OpenSim.Region.Modules.AvatarFactory
36{ 36{
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index b122753..f413fb9 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -34,8 +34,8 @@ using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework.Data.Base; 37using OpenSim.Data.Base;
38using OpenSim.Framework.Data.MapperFactory; 38using OpenSim.Data.MapperFactory;
39 39
40namespace OpenSim.Region.Modules.AvatarFactory 40namespace OpenSim.Region.Modules.AvatarFactory
41{ 41{
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index 12d6871..3eaf5aa 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -33,7 +33,7 @@ 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;
39 39
diff --git a/OpenSim/Tests/Inventory/TestInventory.cs b/OpenSim/Tests/Inventory/TestInventory.cs
index 5906b8f..c1351d9 100644
--- a/OpenSim/Tests/Inventory/TestInventory.cs
+++ b/OpenSim/Tests/Inventory/TestInventory.cs
@@ -32,9 +32,9 @@ using NUnit.Framework;
32 32
33using libsecondlife; 33using libsecondlife;
34using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
35using OpenSim.Framework.Data; 35using OpenSim.Data;
36using OpenSim.Framework.Data.SQLite; 36using OpenSim.Data.SQLite;
37using OpenSim.Framework.Data.MySQL; 37using OpenSim.Data.MySQL;
38using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
39 39
40namespace OpenSim.Test.Inventory 40namespace OpenSim.Test.Inventory