From fdce1be3db287bed901332b90ba57165e201d3fc Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Mon, 19 Oct 2009 16:52:27 -0700
Subject: * Removed OpenSim.Data.NHibernate * Replaced calls to
ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem()
since OpenSim does not use Code Access Security sandboxing
---
bin/AssetInventoryServer.ini.example | 6 ------
bin/NHibernate.Mapping.Attributes.dll | Bin 231936 -> 0 bytes
bin/NHibernate.dll | Bin 1638400 -> 0 bytes
bin/OpenSim.32BitLaunch.exe.config | 6 ------
bin/OpenSim.Grid.UserServer.exe.config | 6 ------
bin/OpenSim.exe.config | 6 ------
bin/OpenSim.ini.example | 6 ------
7 files changed, 30 deletions(-)
delete mode 100644 bin/NHibernate.Mapping.Attributes.dll
delete mode 100644 bin/NHibernate.dll
(limited to 'bin')
diff --git a/bin/AssetInventoryServer.ini.example b/bin/AssetInventoryServer.ini.example
index 20e7ba6..8cfc1f8 100644
--- a/bin/AssetInventoryServer.ini.example
+++ b/bin/AssetInventoryServer.ini.example
@@ -104,11 +104,9 @@ frontends = ReferenceFrontend,OpenSimAssetFrontend,OpenSimInventoryFrontend,Brow
; supported by OpenSim is supported.
asset_database_provider = "OpenSim.Data.SQLite.dll"
;asset_database_provider = "OpenSim.Data.MySQL.dll"
-;asset_database_provider = "OpenSim.Data.NHibernate.dll"
inventory_database_provider = "OpenSim.Data.SQLite.dll"
;inventory_database_provider = "OpenSim.Data.MySQL.dll"
-;inventory_database_provider = "OpenSim.Data.NHibernate.dll"
; Database connection string used by the database backend.
@@ -119,7 +117,3 @@ inventory_database_connect = "URI=file:Inventory.db,version=3"
; For MySQL
;asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
;inventory_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
-
-; For NHibernate
-;asset_database_connect = "SQLiteDialect;SQLite20Driver;Data Source=file:Asset.db;Version=3"
-;inventory_database_connect = "SQLiteDialect;SQLite20Driver;Data Source=file:Asset.db;Version=3"
diff --git a/bin/NHibernate.Mapping.Attributes.dll b/bin/NHibernate.Mapping.Attributes.dll
deleted file mode 100644
index 4e965a4..0000000
Binary files a/bin/NHibernate.Mapping.Attributes.dll and /dev/null differ
diff --git a/bin/NHibernate.dll b/bin/NHibernate.dll
deleted file mode 100644
index 392852e..0000000
Binary files a/bin/NHibernate.dll and /dev/null differ
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index ce6175b..6ac0206 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -23,12 +23,6 @@
-
-
-
-
-
-
diff --git a/bin/OpenSim.Grid.UserServer.exe.config b/bin/OpenSim.Grid.UserServer.exe.config
index d73c2f4..315e69d 100644
--- a/bin/OpenSim.Grid.UserServer.exe.config
+++ b/bin/OpenSim.Grid.UserServer.exe.config
@@ -18,12 +18,6 @@
-
-
-
-
-
-
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index b7fe1ea..c2d93c0 100644
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -24,12 +24,6 @@
-
-
-
-
-
-
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index ba797e6..2d56f4e 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -258,12 +258,9 @@
; Inventory database provider
inventory_plugin = "OpenSim.Data.SQLite.dll"
; inventory_plugin = "OpenSim.Data.MySQL.dll"
- ; inventory_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
; Inventory source SQLite example
inventory_source = "URI=file:inventoryStore.db,version=3"
- ; Inventory Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING)
- ; inventory_source = "SQLiteDialect;SqliteClientDriver;URI=file:Inventory.db,version=3"
; Inventory Source MySQL example
;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
@@ -277,12 +274,9 @@
;
userDatabase_plugin = "OpenSim.Data.SQLite.dll"
; userDatabase_plugin = "OpenSim.Data.MySQL.dll"
- ; userDatabase_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
; User source SQLite example
user_source = "URI=file:userprofiles.db,version=3"
- ; User Source NHibernate Example (DIALECT;DRIVER;CONNECTSTRING)
- ; user_source = "SQLiteDialect;SqliteClientDriver;URI=file:User.db,version=3"
; User Source MySQL example
;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
--
cgit v1.1