aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2013-04-10 13:20:55 +0100
committerMelanie2013-04-10 13:20:55 +0100
commit7cf377fff02de4504965420baaabd56b9a5379ee (patch)
tree5dde9202c352446232e53af9ce85efad4735a572 /bin
parentMerge branch 'master' into careminster (diff)
parentBulletSim: fixing problems with llMoveToTarget. Not all fixed yet. (diff)
downloadopensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.zip
opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.tar.gz
opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.tar.bz2
opensim-SC-7cf377fff02de4504965420baaabd56b9a5379ee.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini5
-rwxr-xr-xbin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config2
-rwxr-xr-xbin/lib32/BulletSim.dllbin570880 -> 1008640 bytes
-rwxr-xr-xbin/lib32/libBulletSim.dylibbin0 -> 1181656 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin1762207 -> 2093987 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin721920 -> 1140224 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin1920169 -> 2258808 bytes
7 files changed, 7 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3eaef61..ca8822c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -43,9 +43,14 @@
43 ; Sets the method that OpenSim will use to fire asynchronous 43 ; Sets the method that OpenSim will use to fire asynchronous
44 ; events. Valid values are UnsafeQueueUserWorkItem, 44 ; events. Valid values are UnsafeQueueUserWorkItem,
45 ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread. 45 ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread.
46 ;
46 ; SmartThreadPool is reported to work well on Mono/Linux, but 47 ; SmartThreadPool is reported to work well on Mono/Linux, but
47 ; UnsafeQueueUserWorkItem has been benchmarked with better 48 ; UnsafeQueueUserWorkItem has been benchmarked with better
48 ; performance on .NET/Windows 49 ; performance on .NET/Windows
50 ;
51 ; UnsafeQueueUserWorkItem refers to the fact that the code creating the event could elevate its security
52 ; privileges. However, as calling code is trusted anyway this is safe (if you set
53 ; TrustedBinaries = true in the [XEngine] section then you already have to trust that incoming code for other reasons).
49 async_call_method = SmartThreadPool 54 async_call_method = SmartThreadPool
50 55
51 ; Max threads to allocate on the FireAndForget thread pool 56 ; Max threads to allocate on the FireAndForget thread pool
diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
index 1bc7e41..2763525 100755
--- a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
+++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
@@ -1,6 +1,8 @@
1<configuration> 1<configuration>
2 <dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" /> 2 <dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" />
3 <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" /> 3 <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" />
4 <dllmap os="osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.dylib" />
5 <dllmap os="osx" cpu="x86-64,ia64" dll="BulletSim" target="lib32/libBulletSim.dylib" />
4 <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.so" /> 6 <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.so" />
5 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="lib64/libBulletSim.so" /> 7 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="lib64/libBulletSim.so" />
6</configuration> 8</configuration>
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 5432813..618d4bd 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
Binary files differ
diff --git a/bin/lib32/libBulletSim.dylib b/bin/lib32/libBulletSim.dylib
new file mode 100755
index 0000000..02f8a7f
--- /dev/null
+++ b/bin/lib32/libBulletSim.dylib
Binary files differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 286d930..e3b40fb 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index dca7116..491ac22 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
Binary files differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index b63feb3..a8ad533 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ