aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/lib32 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-262-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 Adams2012-10-232-0/+0
| | | | | | | | position/rotation setting results in an update event.
* | Merge branch 'master' into careminsterMelanie2012-10-202-0/+0
|\ \ | |/
| * Bulletsim: update DLLs and SOs. Brings C++ routine in sync with C# sources ↵Robert Adams2012-10-192-0/+0
| | | | | | | | and fixes problem where BulletSim would crash on startup on 32 bit Linux.
* | Merge branch 'master' into careminsterMelanie2012-10-122-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 SOsRobert Adams2012-10-112-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-10-032-0/+0
|\ \ | |/
| * BulletSim: fix crash on load that showed up on 32bit Linux.Robert Adams2012-10-022-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-09-292-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * BulletSim: update SOs and DLLsRobert Adams2012-09-282-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-09-243-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-201-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-191-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 f5cecaajustincc2012-09-183-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 careminsterMelanie2012-09-162-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 Adams2012-09-152-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-09-092-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * BulletSim: update the DLLs and SOsRobert Adams2012-09-072-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-09-022-0/+0
|\ \ | |/
| * BulletSim: update the SOs and DLLsRobert Adams2012-08-312-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-08-232-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 Adams2012-08-212-0/+0
| | | | | | | | manifested itself on Linux.
* | Merge branch 'master' into careminsterMelanie2012-08-182-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 Adams2012-08-152-0/+0
| | | | | | | | around at altitudes less than 25m.
* | Merge branch 'master' into careminsterMelanie2012-08-162-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: update DLLs and SOsRobert Adams2012-08-152-0/+0
| |
* | Merge branch 'careminster' into avinationMelanie2012-08-142-0/+0
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * \ Merge branch 'master' into careminsterMelanie2012-08-112-0/+0
| |\ \ | | |/
| | * BulletSim: actually update the DLLs and SOsRobert Adams2012-08-102-0/+0
| | |
| * | Merge branch 'master' into careminsterMelanie2012-08-092-0/+0
| |\ \ | | |/
| | * BulletSim: Added avatar capsule scaling for size of avatar.Robert Adams2012-08-072-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 careminsterMelanie2012-08-072-0/+0
| |\ \ | | |/
| | * BulletSim: update SOs and DLLs to run on more Linux versions. Correct ↵Robert Adams2012-08-062-0/+0
| | | | | | | | | | | | multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
| * | Merge branch 'master' into careminsterMelanie2012-08-042-0/+0
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * BulletSim: update DLLs and SOsRobert Adams2012-08-032-0/+0
| | |
* | | update ode.dll for windows so both 32b and 64b are now version 0.12 (32bUbitUmarov2012-08-041-0/+0
|/ / | | | | | | is just a rebuild)
* | Merge branch 'master' into careminsterMelanie2012-08-032-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * BulletSim: Debugging log statements added. Reduced size of updata buffer ↵Robert Adams2012-08-022-0/+0
| | | | | | | | trying to find a corrupted memory problem. Update DLL and SO.
* | Merge branch 'master' into careminsterMelanie2012-08-012-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 Adams2012-07-312-0/+0
| | | | | | | | not rebuild the physics mesh. Update the DLLs and SOs to latest version.
* | Merge branch 'master' into careminsterMelanie2012-08-012-0/+0
|\ \ | |/
| * BulletSim: update the DLLs and SOs. This fixes the exception on shutdownRobert Adams2012-07-312-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-07-282-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 SOsRobert Adams2012-07-252-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-07-252-0/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * BulletSim: update BulletSim.dlls and so'sRobert Adams2012-07-232-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-07-232-0/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * Update BulletSim DLLs and SOsRobert Adams2012-07-201-0/+0
| |
| * BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵Robert Adams2012-07-202-0/+0
| | | | | | | | attempting to fix a mono compile error.
* | Merge branch 'avination' into careminsterMelanie2012-07-112-0/+0
|\ \ | |/ |/| | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
generated by cgit v1.1 at 2024-12-23 13:17:21 +0000