aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-19 16:52:27 -0700
committerJohn Hurliman2009-10-19 16:52:27 -0700
commitfdce1be3db287bed901332b90ba57165e201d3fc (patch)
tree8f0792e4c4ac4c14a50559f8439573740a7b3326 /bin
parentMerge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into... (diff)
downloadopensim-SC_OLD-fdce1be3db287bed901332b90ba57165e201d3fc.zip
opensim-SC_OLD-fdce1be3db287bed901332b90ba57165e201d3fc.tar.gz
opensim-SC_OLD-fdce1be3db287bed901332b90ba57165e201d3fc.tar.bz2
opensim-SC_OLD-fdce1be3db287bed901332b90ba57165e201d3fc.tar.xz
* Removed OpenSim.Data.NHibernate
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
Diffstat (limited to '')
-rw-r--r--bin/AssetInventoryServer.ini.example6
-rw-r--r--bin/NHibernate.Mapping.Attributes.dllbin231936 -> 0 bytes
-rw-r--r--bin/NHibernate.dllbin1638400 -> 0 bytes
-rw-r--r--bin/OpenSim.32BitLaunch.exe.config6
-rw-r--r--bin/OpenSim.Grid.UserServer.exe.config6
-rw-r--r--bin/OpenSim.exe.config6
-rw-r--r--bin/OpenSim.ini.example6
7 files changed, 0 insertions, 30 deletions
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
104; supported by OpenSim is supported. 104; supported by OpenSim is supported.
105asset_database_provider = "OpenSim.Data.SQLite.dll" 105asset_database_provider = "OpenSim.Data.SQLite.dll"
106;asset_database_provider = "OpenSim.Data.MySQL.dll" 106;asset_database_provider = "OpenSim.Data.MySQL.dll"
107;asset_database_provider = "OpenSim.Data.NHibernate.dll"
108 107
109inventory_database_provider = "OpenSim.Data.SQLite.dll" 108inventory_database_provider = "OpenSim.Data.SQLite.dll"
110;inventory_database_provider = "OpenSim.Data.MySQL.dll" 109;inventory_database_provider = "OpenSim.Data.MySQL.dll"
111;inventory_database_provider = "OpenSim.Data.NHibernate.dll"
112 110
113; Database connection string used by the database backend. 111; Database connection string used by the database backend.
114 112
@@ -119,7 +117,3 @@ inventory_database_connect = "URI=file:Inventory.db,version=3"
119; For MySQL 117; For MySQL
120;asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;" 118;asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
121;inventory_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;" 119;inventory_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;"
122
123; For NHibernate
124;asset_database_connect = "SQLiteDialect;SQLite20Driver;Data Source=file:Asset.db;Version=3"
125;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
--- a/bin/NHibernate.Mapping.Attributes.dll
+++ /dev/null
Binary files differ
diff --git a/bin/NHibernate.dll b/bin/NHibernate.dll
deleted file mode 100644
index 392852e..0000000
--- a/bin/NHibernate.dll
+++ /dev/null
Binary files 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 @@
23 </layout> 23 </layout>
24 </appender> 24 </appender>
25 25
26 <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
27 <logger name="NHibernate" additivity="false">
28 <level value="INFO"/>
29 <appender-ref ref="NHibernateFileLog"/>
30 </logger>
31
32 <root> 26 <root>
33 <level value="DEBUG" /> 27 <level value="DEBUG" />
34 <appender-ref ref="Console" /> 28 <appender-ref ref="Console" />
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 @@
18 <conversionPattern value="%date %-5level - %logger %message%newline" /> 18 <conversionPattern value="%date %-5level - %logger %message%newline" />
19 </layout> 19 </layout>
20 </appender> 20 </appender>
21 <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
22 <logger name="NHibernate" additivity="false">
23 <level value="INFO"/>
24 <appender-ref ref="NHibernateFileLog"/>
25 </logger>
26
27 21
28 <root> 22 <root>
29 <level value="DEBUG" /> 23 <level value="DEBUG" />
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 @@
24 </layout> 24 </layout>
25 </appender> 25 </appender>
26 26
27 <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
28 <logger name="NHibernate" additivity="false">
29 <level value="INFO"/>
30 <appender-ref ref="NHibernateFileLog"/>
31 </logger>
32
33 <root> 27 <root>
34 <level value="DEBUG" /> 28 <level value="DEBUG" />
35 <appender-ref ref="Console" /> 29 <appender-ref ref="Console" />
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 @@
258 ; Inventory database provider 258 ; Inventory database provider
259 inventory_plugin = "OpenSim.Data.SQLite.dll" 259 inventory_plugin = "OpenSim.Data.SQLite.dll"
260 ; inventory_plugin = "OpenSim.Data.MySQL.dll" 260 ; inventory_plugin = "OpenSim.Data.MySQL.dll"
261 ; inventory_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
262 261
263 ; Inventory source SQLite example 262 ; Inventory source SQLite example
264 inventory_source = "URI=file:inventoryStore.db,version=3" 263 inventory_source = "URI=file:inventoryStore.db,version=3"
265 ; Inventory Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING)
266 ; inventory_source = "SQLiteDialect;SqliteClientDriver;URI=file:Inventory.db,version=3"
267 ; Inventory Source MySQL example 264 ; Inventory Source MySQL example
268 ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" 265 ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
269 266
@@ -277,12 +274,9 @@
277 ; 274 ;
278 userDatabase_plugin = "OpenSim.Data.SQLite.dll" 275 userDatabase_plugin = "OpenSim.Data.SQLite.dll"
279 ; userDatabase_plugin = "OpenSim.Data.MySQL.dll" 276 ; userDatabase_plugin = "OpenSim.Data.MySQL.dll"
280 ; userDatabase_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
281 277
282 ; User source SQLite example 278 ; User source SQLite example
283 user_source = "URI=file:userprofiles.db,version=3" 279 user_source = "URI=file:userprofiles.db,version=3"
284 ; User Source NHibernate Example (DIALECT;DRIVER;CONNECTSTRING)
285 ; user_source = "SQLiteDialect;SqliteClientDriver;URI=file:User.db,version=3"
286 ; User Source MySQL example 280 ; User Source MySQL example
287 ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" 281 ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
288 282