aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
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/Region
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/Region')
-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
6 files changed, 17 insertions, 17 deletions
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