Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 3 | -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 | 1 | -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 | 1 | -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 | 3 | -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 | ||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-08-11 | 2 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | BulletSim: actually update the DLLs and SOs | Robert Adams | 2012-08-10 | 2 | -0/+0 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-09 | 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. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-07 | 2 | -0/+0 |
| |\ \ | | |/ | |||||
| | * | 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. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-04 | 2 | -0/+0 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | 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) | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| * | 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. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs | ||||
| * | 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. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 2 | -0/+0 |
|\ \ | |/ | |||||
| * | BulletSim: update the DLLs and SOs. This fixes the exception on shutdown | Robert Adams | 2012-07-31 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | BulletSim: update BulletSim DLLs and SOs | Robert Adams | 2012-07-25 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-07-25 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | ||||
| * | BulletSim: update BulletSim.dlls and so's | Robert Adams | 2012-07-23 | 2 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-07-23 | 2 | -0/+0 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml | ||||
| * | 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. | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2012-07-11 | 2 | -0/+0 |
|\ \ | |/ |/| | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs | ||||
| * | changed ODE lib for win32 to version 0.12 | UbitUmarov | 2012-07-10 | 1 | -0/+0 |
| | | |||||
| * | change linux 32bit libode.so to ode version 0.12 | ubit | 2012-07-10 | 1 | -0/+0 |
| | | |||||
* | | 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 |
| | |||||
* | Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as ↵ | Justin Clark-Casey (justincc) | 2012-02-25 | 3 | -0/+1 |
| | | | | appropriate. |