aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs6
-rw-r--r--bin/config-include/storage/SQLiteLegacyStandalone.ini16
-rw-r--r--bin/config-include/storage/SQLiteStandalone.ini25
3 files changed, 3 insertions, 44 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 1604c4b..2105be1 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -1332,10 +1332,10 @@ namespace OpenSim.Region.Physics.OdePlugin
1332 _parent_scene.waitForSpaceUnlock(m_targetSpace); 1332 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1333 try 1333 try
1334 { 1334 {
1335 if (prim_geom == IntPtr.Zero) 1335 // if (prim_geom == IntPtr.Zero) // setGeom takes care of phys engine recreate and prim_geom pointer
1336 { 1336 // {
1337 SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null)); 1337 SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null));
1338 } 1338 // }
1339 } 1339 }
1340 catch (AccessViolationException) 1340 catch (AccessViolationException)
1341 { 1341 {
diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini
deleted file mode 100644
index 1d4dd29..0000000
--- a/bin/config-include/storage/SQLiteLegacyStandalone.ini
+++ /dev/null
@@ -1,16 +0,0 @@
1; These are the initialization settings for running OpenSim Standalone with an SQLite database
2
3[DatabaseService]
4 StorageProvider = "OpenSim.Data.SQLiteLegacy.dll"
5
6[AvatarService]
7 ConnectionString = "URI=file:avatars.db,version=3"
8
9[AuthenticationService]
10 ConnectionString = "URI=file:auth.db,version=3"
11
12[UserAccountService]
13 ConnectionString = "URI=file:userprofiles.db,version=3"
14
15[FriendsService]
16 ConnectionString = "URI=file:friends.db,version=3"
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
deleted file mode 100644
index fe814d7..0000000
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ /dev/null
@@ -1,25 +0,0 @@
1; These are the initialization settings for running OpenSim Standalone with an SQLite database
2
3[DatabaseService]
4 StorageProvider = "OpenSim.Data.SQLite.dll"
5
6[InventoryService]
7 ;ConnectionString = "URI=file:inventory.db,version=3"
8 ; if you have a legacy inventory store use the connection string below
9 ConnectionString = "URI=file:inventory.db,version=3,UseUTF16Encoding=True"
10
11[AvatarService]
12 ConnectionString = "URI=file:avatars.db,version=3"
13
14[AuthenticationService]
15 ConnectionString = "URI=file:auth.db,version=3"
16
17[UserAccountService]
18 ConnectionString = "URI=file:userprofiles.db,version=3"
19
20[GridUserService]
21 ConnectionString = "URI=file:griduser.db,version=3"
22
23[FriendsService]
24 ConnectionString = "URI=file:friends.db,version=3"
25