OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changing more references to OpenSim.Data

0.6.0-stable
Sean Dague 2008-04-02 15:38:44 +00:00
parent f52c8f3970
commit 86cf07f1c4
17 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/AssetConfig.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Framework
"Default Startup Message", "Welcome to OGS", false); "Default Startup Message", "Welcome to OGS", false);
configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultHttpPort.ToString(), false); "Http Listener port", DefaultHttpPort.ToString(), false);

2
OpenSim/Framework/GridConfig.cs
View File

@ -90,7 +90,7 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to expect from a simulator", "null", false); "Key to expect from a simulator", "null", false);
configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultHttpPort.ToString(), false); "Http Listener port", DefaultHttpPort.ToString(), false);

2
OpenSim/Framework/InventoryConfig.cs
View File

@ -67,7 +67,7 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to expect from user server", "null", false); "Key to expect from user server", "null", false);
configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"DLL for database provider", "OpenSim.Framework.Data.SQLite.dll", false); "DLL for database provider", "OpenSim.Data.SQLite.dll", false);
configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultHttpPort.ToString(), false); "Http Listener port", DefaultHttpPort.ToString(), false);
} }

2
OpenSim/Framework/MessageServerConfig.cs
View File

@ -84,7 +84,7 @@ namespace OpenSim.Framework
"Key to expect from user server", "null", false); "Key to expect from user server", "null", false);
configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
configMember.addConfigurationOption("region_comms_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, configMember.addConfigurationOption("region_comms_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false); "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false);

2
OpenSim/Framework/UserConfig.cs
View File

@ -81,7 +81,7 @@ namespace OpenSim.Framework
"http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString() + "/", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString() + "/",
false); false);
configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultHttpPort.ToString(), false); "Http Listener port", DefaultHttpPort.ToString(), false);

10
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -34,9 +34,9 @@ using libsecondlife;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Data; using OpenSim.Data;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Data.MySQL; using OpenSim.Data.MySQL;
namespace OpenSim.Grid.GridServer namespace OpenSim.Grid.GridServer
{ {
@ -602,10 +602,10 @@ namespace OpenSim.Grid.GridServer
foreach (KeyValuePair<string, IGridData> kvp in _plugins) foreach (KeyValuePair<string, IGridData> kvp in _plugins)
{ {
//OpenSim.Framework.Data.MySQL.MySQLGridData dbengine = new OpenSim.Framework.Data.MySQL.MySQLGridData(); //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData();
try try
{ {
OpenSim.Framework.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Framework.Data.MySQL.MySQLGridData)(kvp.Value); OpenSim.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Data.MySQL.MySQLGridData)(kvp.Value);
//DataResponse insertResponse = mysqldata.DeleteProfile(TheSim); //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim);
DataResponse insertResponse = mysqldata.DeleteProfile(uuid); DataResponse insertResponse = mysqldata.DeleteProfile(uuid);
switch (insertResponse) switch (insertResponse)
@ -720,7 +720,7 @@ namespace OpenSim.Grid.GridServer
IList simProfileList = new ArrayList(); IList simProfileList = new ArrayList();
bool fastMode = false; // MySQL Only bool fastMode = false; // MySQL Only
fastMode = (Config.DatabaseProvider == "OpenSim.Framework.Data.MySQL.dll"); fastMode = (Config.DatabaseProvider == "OpenSim.Data.MySQL.dll");
if (fastMode) if (fastMode)
{ {

2
OpenSim/Grid/MessagingServer/MessageService.cs
View File

@ -36,7 +36,7 @@ using libsecondlife;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Data; using OpenSim.Data;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using FriendRights = libsecondlife.FriendRights; using FriendRights = libsecondlife.FriendRights;

2
OpenSim/Grid/MessagingServer/PresenceInformer.cs
View File

@ -35,7 +35,7 @@ using libsecondlife;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Data; using OpenSim.Data;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
namespace OpenSim.Grid.MessagingServer namespace OpenSim.Grid.MessagingServer

2
OpenSim/Grid/MessagingServer/UserPresenceData.cs
View File

@ -30,7 +30,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using libsecondlife; using libsecondlife;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Data; using OpenSim.Data;
namespace OpenSim.Grid.MessagingServer namespace OpenSim.Grid.MessagingServer
{ {

2
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@ -35,7 +35,7 @@ using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Data; using OpenSim.Data;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Statistics; using OpenSim.Framework.Statistics;
using OpenSim.Framework.UserManagement; using OpenSim.Framework.UserManagement;

20
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -191,7 +191,7 @@ namespace OpenSim
config.Set("physical_prim", true); config.Set("physical_prim", true);
config.Set("see_into_this_sim_from_neighbor", true); config.Set("see_into_this_sim_from_neighbor", true);
config.Set("serverside_object_permissions", false); 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_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("storage_prim_inventories", true); config.Set("storage_prim_inventories", true);
config.Set("startup_console_commands_file", String.Empty); config.Set("startup_console_commands_file", String.Empty);
@ -208,9 +208,9 @@ namespace OpenSim
{ {
config.Set("accounts_authenticate", false); config.Set("accounts_authenticate", false);
config.Set("welcome_message", "Welcome to OpenSim"); config.Set("welcome_message", "Welcome to OpenSim");
config.Set("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
config.Set("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll"); config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
config.Set("asset_plugin", "OpenSim.Framework.Data.SQLite.dll"); config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
config.Set("dump_assets_to_file", false); config.Set("dump_assets_to_file", false);
} }
@ -270,11 +270,11 @@ namespace OpenSim
m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); 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") if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll")
{ {
m_storageDll = "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.Framework.Data.SQLite.dll."); Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
Thread.Sleep(3000); Thread.Sleep(3000);
} }
m_storageConnectionString m_storageConnectionString
@ -297,11 +297,11 @@ namespace OpenSim
m_standaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", false); m_standaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", false);
m_standaloneWelcomeMessage = standaloneConfig.GetString("welcome_message", "Welcome to OpenSim"); m_standaloneWelcomeMessage = standaloneConfig.GetString("welcome_message", "Welcome to OpenSim");
m_standaloneInventoryPlugin = m_standaloneInventoryPlugin =
standaloneConfig.GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); standaloneConfig.GetString("inventory_plugin", "OpenSim.Data.SQLite.dll");
m_standaloneUserPlugin = m_standaloneUserPlugin =
standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Framework.Data.SQLite.dll"); standaloneConfig.GetString("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
m_standaloneAssetPlugin = 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); m_dumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false);
} }

2
OpenSim/Region/Environment/Modules/AppearanceTableMapper.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Data.Base; using OpenSim.Data.Base;
namespace OpenSim.Region.Environment.Modules namespace OpenSim.Region.Environment.Modules
{ {

4
OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
View File

@ -33,10 +33,10 @@ using libsecondlife;
using Nini.Config; using Nini.Config;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Data.MySQLMapper; using OpenSim.Data.MySQLMapper;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Data.Base; using OpenSim.Data.Base;
namespace OpenSim.Region.Environment.Modules namespace OpenSim.Region.Environment.Modules
{ {

2
OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Data.Base; using OpenSim.Data.Base;
namespace OpenSim.Region.Modules.AvatarFactory namespace OpenSim.Region.Modules.AvatarFactory
{ {

4
OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
View File

@ -34,8 +34,8 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Data.Base; using OpenSim.Data.Base;
using OpenSim.Framework.Data.MapperFactory; using OpenSim.Data.MapperFactory;
namespace OpenSim.Region.Modules.AvatarFactory namespace OpenSim.Region.Modules.AvatarFactory
{ {

2
OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
View File

@ -33,7 +33,7 @@ using System.IO;
using libsecondlife; using libsecondlife;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Data; using OpenSim.Data;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;

6
OpenSim/Tests/Inventory/TestInventory.cs
View File

@ -32,9 +32,9 @@ using NUnit.Framework;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Types; using OpenSim.Framework.Types;
using OpenSim.Framework.Data; using OpenSim.Data;
using OpenSim.Framework.Data.SQLite; using OpenSim.Data.SQLite;
using OpenSim.Framework.Data.MySQL; using OpenSim.Data.MySQL;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
namespace OpenSim.Test.Inventory namespace OpenSim.Test.Inventory