Melanie
daa1d99513
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-11-30 01:19:08 +00:00
Robert Adams
24b3b4df2e
BulletSim: update DLLs and SOs to remove simulator crash when calling SetInterpolationAngularVelocity.
2012-11-28 09:48:41 -08:00
Robert Adams
bd635e264a
BulletSim: update DLLs and SOs with new collision margin setting function.
2012-11-25 20:04:31 -08:00
Melanie
c4c6121752
Merge branch 'master' into careminster
2012-11-22 03:17:33 +00:00
Robert Adams
56ef180c92
BulletSim: update DLLs and SOs. No functional changes. Only the parameter block format changed.
2012-11-21 16:44:02 -08:00
Melanie
9f2d232c71
Merge branch 'master' into careminster
2012-11-19 22:53:03 +00:00
Robert Adams
079a1e704f
BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim libraries with code stripped of the obsolete code.
2012-11-18 18:17:30 -08:00
Melanie
b3e99a4d48
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
2012-11-08 04:51:00 +00:00
Robert Adams
6df9d40d99
BulletSim: update the DLLs and SOs
2012-11-06 18:17:00 -08:00
Melanie
c623e35805
Merge branch 'master' into careminster
2012-11-04 22:44:42 +00:00
Robert Adams
895d28f14d
BulletSim: update the DLLs and SOs
2012-11-03 21:28:23 -07:00
Melanie
e7a6328ea4
Merge branch 'master' into careminster
2012-11-01 15:52:32 +00:00
Justin Clark-Casey (justincc)
ccb17eab71
Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit version from libopenmetaverse commit 3731ee4
...
This is because macosx mono is 32-bit and this can't p/invoke 64-bit binaries.
However, the reverse is also true.
If OpenSimulator stops working for you then please complain! Long term alternative is probably to build a fat binary with both architectures.
2012-11-01 03:31:30 +00:00
Melanie
26cc57b6ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
Robert Adams
de47646c3d
BulletSim: update binaries with small change that insures that manual position/rotation setting results in an update event.
2012-10-23 17:34:14 -07:00
Melanie
6ad8d3c43f
Merge branch 'master' into careminster
2012-10-20 02:33:24 +01:00
Robert Adams
45df324ab3
Bulletsim: update DLLs and SOs. Brings C++ routine in sync with C# sources and fixes problem where BulletSim would crash on startup on 32 bit Linux.
2012-10-19 15:47:51 -07:00
Melanie
6ce93b22d1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-12 19:05:06 +01:00
Robert Adams
b63134764f
BulletSim: update the DLLs and SOs
2012-10-11 14:01:35 -07:00
Melanie
8a552ac907
Merge branch 'master' into careminster
2012-10-03 17:40:13 +01:00
Robert Adams
a5b8359b8e
BulletSim: fix crash on load that showed up on 32bit Linux.
2012-10-02 17:04:33 -07:00
Melanie
71dd55a1ce
Merge branch 'master' into careminster
...
Conflicts:
CONTRIBUTORS.txt
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-09-29 19:21:07 +01:00
Robert Adams
7f96bb601a
BulletSim: update SOs and DLLs
2012-09-28 12:51:47 -07:00
Melanie
bbaf2c5a80
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-24 20:14:00 +01:00
Justin Clark-Casey (justincc)
e50b6b5334
Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this time using lkalif's linux libraries built against a much earlier libc (2.7)
2012-09-20 01:26:35 +01:00
Justin Clark-Casey (justincc)
e50155ebca
Downgrade libopenjpeg back to 1.3 from 1.5.
...
This is because libopenjpeg 1.5 appears to require a minimum of glibc 2.14, whereas at least one fairly recent distro (openSUSE 11.4 from 2011-03-10) only has glibc
Further investigation pending.
2012-09-19 00:35:06 +01:00
justincc
95809cabd9
Update libopenmetaverse components to commit f5cecaa
...
Among other things this allows pCampbot to work under Windows since libopenmateverse now ships the same log4net.dll (publicly signed) as OpenSimulator
This also updates the libopenmetaverse embedded libopenjpeg from 1.3 to 1.5.
DLL naming and mapping for non-Windows libopenjpeg changes to remove version number to make future udpates easier and bring it into line with names of other shipped DLLs.
libopenjpeg updates have been made for OSX, Windows (32 and 64 bit) and Linux (32 and 64 bit). Please report any issues.
2012-09-18 23:45:06 +01:00
Melanie
db774d4292
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
Robert Adams
b602b476ad
BulletSim: update DLLs and SOs and remove some debugging code.
2012-09-15 15:36:13 -07:00
Melanie
0d97beefce
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-09 13:30:24 +01:00
Robert Adams
d8df2d6bed
BulletSim: update the DLLs and SOs
2012-09-07 16:05:34 -07:00
Melanie
e2e8b09059
Merge branch 'master' into careminster
2012-09-02 22:15:55 +01:00
Robert Adams
32b534f324
BulletSim: update the SOs and DLLs
2012-08-31 11:41:39 -07:00
Melanie
f8603a215d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-23 01:41:47 +01:00
Robert Adams
568de9313a
BulletSim: update DLLs and SOs to eliminate terrain update crash which manifested itself on Linux.
2012-08-21 20:55:48 -07:00
Melanie
aee7a31bc3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-18 13:17:39 +01:00
Melanie
90ad98370a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-16 02:46:48 +01:00
Robert Adams
ae5db637f2
BulletSim: update DLLs and SOs to fix the problem with avatars jumping around at altitudes less than 25m.
2012-08-15 16:29:46 -07:00
Robert Adams
9f83f4bfa3
BulletSim: update DLLs and SOs
2012-08-15 12:08:29 -07:00
Melanie
9b014a7167
Merge branch 'careminster' into avination
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
2012-08-14 02:34:03 +01:00
Robert Adams
3a55d5b123
BulletSim: actually update the DLLs and SOs
2012-08-10 16:34:22 -07:00
Robert Adams
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
Robert Adams
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
UbitUmarov
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
Robert Adams
d5cd60131f
BulletSim: update DLLs and SOs
2012-08-03 15:10:00 -07:00
Robert Adams
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
Robert Adams
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
Robert Adams
f9a8915cca
BulletSim: update the DLLs and SOs. This fixes the exception on shutdown
2012-07-31 09:44:32 -07:00
Robert Adams
c6d02801db
BulletSim: update BulletSim DLLs and SOs
2012-07-25 16:31:22 -07:00
Robert Adams
892dd59b13
BulletSim: update BulletSim.dlls and so's
2012-07-23 16:38:31 -07:00