Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-11-04 | 2 | -0/+0 |
|\ | |||||
| * | BulletSim: update the DLLs and SOs | Robert Adams | 2012-11-03 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-01 | 1 | -0/+0 |
|\ \ | |/ | |||||
| * | Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a 32-bit ↵ | Justin Clark-Casey (justincc) | 2012-11-01 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | | | | | | | | | 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 | ||||
| * | BulletSim: update binaries with small change that insures that manual ↵ | Robert Adams | 2012-10-23 | 2 | -0/+0 |
| | | | | | | | | position/rotation setting results in an update event. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 2 | -0/+0 |
|\ \ | |/ | |||||
| * | Bulletsim: update DLLs and SOs. Brings C++ routine in sync with C# sources ↵ | Robert Adams | 2012-10-19 | 2 | -0/+0 |
| | | | | | | | | and fixes problem where BulletSim would crash on startup on 32 bit Linux. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | BulletSim: update the DLLs and SOs | Robert Adams | 2012-10-11 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-03 | 2 | -0/+0 |
|\ \ | |/ | |||||
| * | BulletSim: fix crash on load that showed up on 32bit Linux. | Robert Adams | 2012-10-02 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-09-29 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | ||||
| * | BulletSim: update SOs and DLLs | Robert Adams | 2012-09-28 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 4 | -0/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this ↵ | Justin Clark-Casey (justincc) | 2012-09-20 | 2 | -0/+0 |
| | | | | | | | | time using lkalif's linux libraries built against a much earlier libc (2.7) | ||||
| * | Downgrade libopenjpeg back to 1.3 from 1.5. | Justin Clark-Casey (justincc) | 2012-09-19 | 2 | -0/+0 |
| | | | | | | | | | | 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. | ||||
| * | Update libopenmetaverse components to commit f5cecaa | justincc | 2012-09-18 | 4 | -0/+0 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs | ||||
| * | BulletSim: update DLLs and SOs and remove some debugging code. | Robert Adams | 2012-09-15 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | BulletSim: update the DLLs and SOs | Robert Adams | 2012-09-07 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-09-02 | 2 | -0/+0 |
|\ \ | |/ | |||||
| * | BulletSim: update the SOs and DLLs | Robert Adams | 2012-08-31 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-23 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | BulletSim: update DLLs and SOs to eliminate terrain update crash which ↵ | Robert Adams | 2012-08-21 | 2 | -0/+0 |
| | | | | | | | | manifested itself on Linux. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | | | | | | | 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 | ||||
| * | BulletSim: update DLLs and SOs to fix the problem with avatars jumping ↵ | Robert Adams | 2012-08-15 | 2 | -0/+0 |
| | | | | | | | | around at altitudes less than 25m. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-16 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | BulletSim: update DLLs and SOs | Robert Adams | 2012-08-15 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | ||||
| * | BulletSim: actually update the DLLs and SOs | Robert Adams | 2012-08-10 | 2 | -0/+0 |
| | | |||||
| * | BulletSim: Added avatar capsule scaling for size of avatar. | Robert Adams | 2012-08-07 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | 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. | ||||
| * | BulletSim: update SOs and DLLs to run on more Linux versions. Correct ↵ | Robert Adams | 2012-08-06 | 2 | -0/+0 |
| | | | | | | | | multiple buoyancy settings when character flying. Remove chatty log message on prim destruction. | ||||
| * | BulletSim: update DLLs and SOs | Robert Adams | 2012-08-03 | 2 | -0/+0 |
| | | |||||
* | | update ode.dll for windows so both 32b and 64b are now version 0.12 (32b | UbitUmarov | 2012-08-04 | 1 | -0/+0 |
|/ | | | | is just a rebuild) | ||||
* | BulletSim: Debugging log statements added. Reduced size of updata buffer ↵ | Robert Adams | 2012-08-02 | 2 | -0/+0 |
| | | | | trying to find a corrupted memory problem. Update DLL and SO. | ||||
* | BulletSim: fix problem where resizing a primary shape (cube or sphere) would ↵ | Robert Adams | 2012-07-31 | 2 | -0/+0 |
| | | | | not rebuild the physics mesh. Update the DLLs and SOs to latest version. | ||||
* | BulletSim: update the DLLs and SOs. This fixes the exception on shutdown | Robert Adams | 2012-07-31 | 2 | -0/+0 |
| | |||||
* | BulletSim: update BulletSim DLLs and SOs | Robert Adams | 2012-07-25 | 2 | -0/+0 |
| | |||||
* | BulletSim: update BulletSim.dlls and so's | Robert Adams | 2012-07-23 | 2 | -0/+0 |
| | |||||
* | Update BulletSim DLLs and SOs | Robert Adams | 2012-07-20 | 1 | -0/+0 |
| | |||||
* | BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵ | Robert Adams | 2012-07-20 | 2 | -0/+0 |
| | | | | attempting to fix a mono compile error. | ||||
* | BulletSim: update the binaries to the current sources | Robert Adams | 2012-07-06 | 2 | -0/+0 |
| | |||||
* | BulletSim: update 64 bit libraries and change Linux configuration to use the ↵ | Robert Adams | 2012-03-28 | 2 | -0/+0 |
| | | | | files in the lib32 and lib64 directories as needed. | ||||
* | BulletSim: update BulletSim binaries and configuration fixing a crash which ↵ | Robert Adams | 2012-03-26 | 2 | -0/+0 |
| | | | | happens when there are more than a few hundred physical objects. | ||||
* | BulletSim: update BulletSim.dll and libBulletSim.so with latest versions | Robert Adams | 2012-03-26 | 2 | -0/+0 |
| | |||||
* | BulletSim: add updated (but not working) BulletSim dlls | Robert Adams | 2012-03-23 | 2 | -0/+0 |
| | |||||
* | BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to ↵ | Robert Adams | 2012-03-23 | 2 | -0/+0 |
| | | | | the new lib32 and lib64 binary directories | ||||
* | Move libopenjpeg native libraries into lib32 and lib64 as appropriate. | Justin Clark-Casey (justincc) | 2012-02-25 | 2 | -0/+0 |
| |