From 86cf07f1c40b82b3f90bb7275444f522f14fbc9d Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 2 Apr 2008 15:38:44 +0000 Subject: changing more references to OpenSim.Data --- OpenSim/Region/Application/OpenSimMain.cs | 20 ++++++++++---------- .../Environment/Modules/AppearanceTableMapper.cs | 2 +- .../Environment/Modules/AvatarFactoryModule.cs | 4 ++-- .../Modules/AvatarFactory/AppearanceTableMapper.cs | 2 +- .../Modules/AvatarFactory/AvatarFactoryModule.cs | 4 ++-- .../OpenSim.DataStore.MSSQL/MSSQLDataStore.cs | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'OpenSim/Region') 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 config.Set("physical_prim", true); config.Set("see_into_this_sim_from_neighbor", true); config.Set("serverside_object_permissions", false); - config.Set("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); + config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); config.Set("storage_prim_inventories", true); config.Set("startup_console_commands_file", String.Empty); @@ -208,9 +208,9 @@ namespace OpenSim { config.Set("accounts_authenticate", false); config.Set("welcome_message", "Welcome to OpenSim"); - config.Set("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); - config.Set("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll"); - config.Set("asset_plugin", "OpenSim.Framework.Data.SQLite.dll"); + config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll"); + config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); + config.Set("asset_plugin", "OpenSim.Data.SQLite.dll"); config.Set("dump_assets_to_file", false); } @@ -270,11 +270,11 @@ namespace OpenSim m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); - m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Framework.Data.SQLite.dll"); + m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Data.SQLite.dll"); if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll") { - m_storageDll = "OpenSim.Framework.Data.SQLite.dll"; - Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Framework.Data.SQLite.dll."); + m_storageDll = "OpenSim.Data.SQLite.dll"; + Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll."); Thread.Sleep(3000); } m_storageConnectionString @@ -297,11 +297,11 @@ namespace OpenSim m_standaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", false); m_standaloneWelcomeMessage = standaloneConfig.GetString("welcome_message", "Welcome to OpenSim"); m_standaloneInventoryPlugin = - standaloneConfig.GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); + standaloneConfig.GetString("inventory_plugin", "OpenSim.Data.SQLite.dll"); m_standaloneUserPlugin = - standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll"); + standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); m_standaloneAssetPlugin = - standaloneConfig.GetString("asset_plugin", "OpenSim.Framework.Data.SQLite.dll"); + standaloneConfig.GetString("asset_plugin", "OpenSim.Data.SQLite.dll"); m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); } 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; using System.Text; using OpenSim.Region.Environment.Scenes; using OpenSim.Framework; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; namespace OpenSim.Region.Environment.Modules { 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; using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Data.MySQLMapper; +using OpenSim.Data.MySQLMapper; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; namespace OpenSim.Region.Environment.Modules { 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; using System.Text; using OpenSim.Region.Environment.Scenes; using OpenSim.Framework; -using OpenSim.Framework.Data.Base; +using OpenSim.Data.Base; namespace OpenSim.Region.Modules.AvatarFactory { 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; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -using OpenSim.Framework.Data.Base; -using OpenSim.Framework.Data.MapperFactory; +using OpenSim.Data.Base; +using OpenSim.Data.MapperFactory; namespace OpenSim.Region.Modules.AvatarFactory { 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; using libsecondlife; using OpenSim.Framework; using OpenSim.Framework.Console; -using OpenSim.Framework.Data; +using OpenSim.Data; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -- cgit v1.1