9b014a7167
Merge branch 'careminster' into avination
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
2012-08-14 02:34:03 +01:00
93e3ab3ebd
Merge branch 'master' into careminster
2012-08-11 17:32:30 +01:00
3a55d5b123
BulletSim: actually update the DLLs and SOs
2012-08-10 16:34:22 -07:00
6ed3761147
Merge branch 'master' into careminster
2012-08-09 02:37:49 +01:00
19417fca41
BulletSim: Added avatar capsule scaling for size of avatar.
...
This also fixes computation of avatar mass.
Added parameter MaxPersistantManifoldPoolSize.
Fixed a parameter setting bug which caused crashes of there were
more than 400 or so physical objects. I tested up to 5000.
Updated BulletSim DLLs and SOs.
2012-08-07 17:15:06 -07:00
85b4eab005
Merge branch 'master' into careminster
2012-08-07 20:20:28 +01:00
4adb3471ac
BulletSim: update SOs and DLLs to run on more Linux versions. Correct multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
2012-08-06 12:55:52 -07:00
1b7a720b9f
update ode.dll for windows so both 32b and 64b are now version 0.12 (32b
...
is just a rebuild)
2012-08-04 10:36:50 +01:00
b9c4a637b4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-08-04 03:00:20 +01:00
d5cd60131f
BulletSim: update DLLs and SOs
2012-08-03 15:10:00 -07:00
0c00abcce1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-08-03 16:46:11 +01:00
8b04e8a297
BulletSim: Debugging log statements added. Reduced size of updata buffer trying to find a corrupted memory problem. Update DLL and SO.
2012-08-02 16:30:23 -07:00
ecffcf7f65
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2012-08-01 23:03:03 +01:00
c51ef38e2d
BulletSim: fix problem where resizing a primary shape (cube or sphere) would not rebuild the physics mesh. Update the DLLs and SOs to latest version.
2012-07-31 16:23:52 -07:00
8114260946
Merge branch 'master' into careminster
2012-08-01 00:08:02 +01:00
f9a8915cca
BulletSim: update the DLLs and SOs. This fixes the exception on shutdown
2012-07-31 09:44:32 -07:00
771d79e83e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
2012-07-28 00:39:36 +01:00
c6d02801db
BulletSim: update BulletSim DLLs and SOs
2012-07-25 16:31:22 -07:00
6930d696e9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-07-25 18:19:12 +01:00
892dd59b13
BulletSim: update BulletSim.dlls and so's
2012-07-23 16:38:31 -07:00
fb8e92c90b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Helpers.cs
prebuild.xml
2012-07-23 18:54:12 +01:00
ac612e2105
Update BulletSim DLLs and SOs
2012-07-20 16:12:54 -07:00
b25d874afa
BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs attempting to fix a mono compile error.
2012-07-20 15:34:19 -07:00
89c9528e38
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-07-11 14:27:33 +01:00
0d60568564
changed ODE lib for win32 to version 0.12
2012-07-10 01:29:44 +01:00
34f4dc29a1
change linux 32bit libode.so to ode version 0.12
2012-07-10 02:24:09 +02:00
af9d8de515
BulletSim: update the binaries to the current sources
2012-07-06 15:56:35 -07:00
4138880464
BulletSim: update 64 bit libraries and change Linux configuration to use the files in the lib32 and lib64 directories as needed.
2012-03-28 15:36:20 -07:00
84c9bd52d3
BulletSim: update BulletSim binaries and configuration fixing a crash which happens when there are more than a few hundred physical objects.
2012-03-26 13:48:15 -07:00
3691e39178
BulletSim: update BulletSim.dll and libBulletSim.so with latest versions
2012-03-26 08:48:51 -07:00
2f6e8564fe
BulletSim: add updated (but not working) BulletSim dlls
2012-03-23 13:15:20 -07:00
6c50442625
BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to the new lib32 and lib64 binary directories
2012-03-23 13:15:13 -07:00
4a5f9fe6a2
Move libopenjpeg native libraries into lib32 and lib64 as appropriate.
2012-02-25 04:26:32 +00:00
6138662716
Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.
2012-02-25 03:25:56 +00:00
daee2eda93
Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.
...
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
2012-02-21 04:10:39 +00:00
68a4ef5ef6
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
2012-02-21 02:52:20 +00:00
b817c337dc
On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit
...
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
2012-02-18 00:33:52 +00:00
Melanie