aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2007-08-22 19:40:30 +0000
committerTedd Hansen2007-08-22 19:40:30 +0000
commitffa8bd6cddb43a5ee2b426af0aa4b82550ee57f0 (patch)
tree3b0ae32265ae4b0caac8bf0bc4828305d83f8411
parentGC.GetTotalMemory(true) was blocking. (diff)
downloadopensim-SC_OLD-ffa8bd6cddb43a5ee2b426af0aa4b82550ee57f0.zip
opensim-SC_OLD-ffa8bd6cddb43a5ee2b426af0aa4b82550ee57f0.tar.gz
opensim-SC_OLD-ffa8bd6cddb43a5ee2b426af0aa4b82550ee57f0.tar.bz2
opensim-SC_OLD-ffa8bd6cddb43a5ee2b426af0aa4b82550ee57f0.tar.xz
Seems like I commited OpenSim.ini and inventoryStore.db unintentionally in last commit...
-rw-r--r--bin/OpenSim.ini9
-rw-r--r--bin/inventoryStore.dbbin10240 -> 10240 bytes
2 files changed, 2 insertions, 7 deletions
diff --git a/bin/OpenSim.ini b/bin/OpenSim.ini
index 6932d49..bfe986d 100644
--- a/bin/OpenSim.ini
+++ b/bin/OpenSim.ini
@@ -1,17 +1,12 @@
1[Startup] 1[Startup]
2gridmode = false 2gridmode = false
3physics = basicphysics 3physics = basicphysics
4; Prim Storage 4storage_plugin = "OpenSim.DataStore.NullStorage.dll"
5; if you would like to use sqlite uncomment the following line (and
6; comment the NullStorage line)
7storage_plugin = "OpenSim.DataStore.MonoSqlite.dll"
8;storage_plugin = "OpenSim.DataStore.NullStorage.dll"
9startup_console_commands_file = "startup_commands.txt" 5startup_console_commands_file = "startup_commands.txt"
10serverside_object_permissions = false
11 6
12 7
13[StandAlone] 8[StandAlone]
14accounts_authenticate = true 9accounts_authenticate = false
15welcome_message = "Welcome to OpenSim" 10welcome_message = "Welcome to OpenSim"
16inventory_plugin = "OpenSim.Framework.Data.SQLite.dll" 11inventory_plugin = "OpenSim.Framework.Data.SQLite.dll"
17userDatabase_plugin = "OpenSim.Framework.Data.DB4o.dll" 12userDatabase_plugin = "OpenSim.Framework.Data.DB4o.dll"
diff --git a/bin/inventoryStore.db b/bin/inventoryStore.db
index d283ea1..070db2b 100644
--- a/bin/inventoryStore.db
+++ b/bin/inventoryStore.db
Binary files differ