aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-10-031-1/+12
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fix a viewer crash issueMelanie2012-10-031-1/+12
| |
| * Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
| |
* | Merge branch 'master' into careminsterMelanie2012-10-0317-307/+646
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-0214-308/+597
| |\ \
| | * | correcting typoSignpostMarv2012-10-021-3/+3
| | | |
| | * | taking into account the recent introduction of implicit operatorsSignpostMarv2012-10-021-3/+1
| | | |
| | * | added perms checking, duplicated functionality to methods that do not ↵SignpostMarv2012-10-023-6/+86
| | | | | | | | | | | | | | | | require perms and have higher threat level
| | * | fixing copypastaSignpostMarv2012-10-021-1/+1
| | | |
| | * | implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-025-3/+72
| | | |
| | * | BulletSim: Make parameter value defaults match what should be the default ↵Robert Adams2012-10-022-14/+14
| | | | | | | | | | | | | | | | and what is in OpenSimDefaults.ini. Comment and debug printout changes.
| | * | BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its ↵Robert Adams2012-10-023-5/+64
| | | | | | | | | | | | | | | | children of BSPrim and BSCharacter.
| | * | BulletSim: Fix problem where box shapes were not being rebuilt if the shape ↵Robert Adams2012-10-021-4/+6
| | | | | | | | | | | | | | | | type changed.
| | * | BulletSim: Fix linkset problem where delayed manipulations of child objects ↵Robert Adams2012-10-021-10/+8
| | | | | | | | | | | | | | | | was using the child shape address at call time rather than the one created at taint time.
| | * | BulletSim: call ForcePosition and ForceOrientation in BSDynamics so there is ↵Robert Adams2012-10-021-39/+57
| | | | | | | | | | | | | | | | no lag between what the vehicle code sees and what the physics engine is using.
| | * | Add Flush() method to LogWriter. Also correct line endings to Linux form.Robert Adams2012-10-021-161/+170
| | | |
| | * | BulletSim: fix the FloatOnWater code so avatars can normally go underwater.Robert Adams2012-10-021-1/+1
| | | |
| | * | BulletSim: impliment FloatOnWater OS function.Robert Adams2012-10-023-22/+104
| | | |
| | * | Correct my name in CONTRIBUTORS.txtRobert Adams2012-10-021-35/+16
| | | |
| | * | BulletSim: remove warnings for unused variables.Robert Adams2012-10-023-14/+7
| | | |
| * | | Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
| |/ /
| * | Add money event routing to the script engine.Melanie2012-10-021-0/+3
| | |
| * | Send money() events to the clicked prim. Reverting a change I made over a ↵Melanie2012-10-021-1/+1
| | | | | | | | | | | | year ago.
| * | Prevent the ExtraSettings code from crashing SQLite driven sims.Melanie2012-10-021-0/+6
| | |
| * | Add using clause I missedMelanie2012-09-301-0/+1
| | |
| * | Allow up to 12 simultaneous connections to a given endpoint rather than 2Melanie2012-09-301-0/+1
| | |
| * | Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-3011-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
| * | Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-3011-6/+17
| | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
* | | Merge branch 'avination' into careminsterMelanie2012-09-293-37/+136
|\ \ \ | | |/ | |/|
| * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-09-283-57/+143
| |\ \
| | * | make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| | | |
| * | | Fix a possible NREMelanie2012-09-281-3/+10
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-09-2916-1403/+2222
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | | Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an ↵Justin Clark-Casey (justincc)2012-09-292-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | object is attached from the scene. Enables previously disabled regression test. Based on SingpostMarv's patch in http://opensimulator.org/mantis/view.php?id=6302 but I prefer a simpler approach that does not expose a resume scripts option right now.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-2913-1372/+2150
| |\ \ \
| | * | | BulletSim: remember to release the physical body and shape when a prim is ↵Robert Adams2012-09-282-16/+16
| | | | | | | | | | | | | | | | | | | | destroyed. This fixes many problems with physical linksets.
| | * | | BulletSim: add separate runtime and taint-time linkset children lists to ↵Robert Adams2012-09-273-80/+93
| | | | | | | | | | | | | | | | | | | | keep the creation of constraints separate from runtime.
| | * | | BulletSim: rename some constraint variables to be consistant with other name ↵Robert Adams2012-09-277-116/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use. Added callbacks for shape and body changes in GetBodyAndShape() so the linkset constraints can be picked up and restored. A better design might be to have a "prim shape changed" event. Think about that. Added constraint types to general constraint class.
| | * | | BulletSim: remove the trailing spaces from lines to make git happierRobert Adams2012-09-2710-276/+275
| | | | |
| | * | | BulletSim: remove the unused body management code from BSPrim. There is no ↵Robert Adams2012-09-271-374/+0
| | | | | | | | | | | | | | | | | | | | going back now.
| | * | | BulletSim: Fix linkset crash. Caused by the different body and shapeRobert Adams2012-09-279-94/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointers at runtime and at taint-time. Now passes the body into the taint. Vehicles zero inertia when active to eliminate Bullet's contribution to vehicle motion.
| | * | | BulletSim: Terrain sets proper collision flags on creation.Robert Adams2012-09-274-52/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static objects are set to ISLAND_SLEEPING rather than DISABLE_SIMULATION. Might reconsider this and, alternatively, have dynamic objects force activation. Clean up use of DetailLog().
| | * | | BulletSim: btGhostObjects working to make 'volume detect' work.Robert Adams2012-09-277-191/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrangement and cleanup of shape collection code. Much more readable. Enabling and use of collision filters and masks. Addition of ID to body creation BulletSimAPI calls so always set in shape for collision reporting. Change default of ShouldSplitSimulationIslands and ShouldRandomizeSolverOrder from 'false' to 'true'. When 'false', this suppresses NO_CONTACT_RESPONSE which makes volume detect fail.
| | * | | BulletSim: renamed members of BulletShape, BulletSim and BulletBodyRobert Adams2012-09-2711-270/+482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so the members case is consistant. Caused modifications everywhere. New logic in BSShapeCollection to track use and sharing of shapes. I just reslized, though, that shapes cannot be shared because the shape's UserPointer is the localID of the prim and is required for tracking collisions. More changes coming. Added DuplicateCollisionShape2() to API and changed BuildNativeShape2 to take a ShapeData structure so don't have to pass so many parameters. This matches the latest version of BulletSim.dll. Additions and removal of DetailLog() statements for debugging.
| | * | | BulletSim: fix regression that caused cylindar shapes to have a box ↵Robert Adams2012-09-271-1/+9
| | | | | | | | | | | | | | | | | | | | collision shape
| | * | | BulletSim: complete code for managed code shape and body tracking. Not debugged.Robert Adams2012-09-275-130/+675
| | | | | | | | | | | | | | | | | | | | | | | | | Eliminate some null exceptions created adding the above code. Add and remove some detailed logging statements.
| | * | | BulletSim: add class and infrastructure for shape and objectRobert Adams2012-09-275-39/+192
| | | | | | | | | | | | | | | | | | | | | | | | | tracking in the C# code. Needed for the changing body type (to and from GhostObjects) for volumeDetect.
| | * | | BulletSim: Convert BSCharacter to use common BSPhysObject code and variables.Robert Adams2012-09-275-117/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix avatar height calculation to properly account for the capsule ends. Rearrange some locking in TerrainManager to eliminate possible race conditions. Move DetailLog() definition into common BSPhysObject class. Some variable renaming to make usage clearer (refactor.rename makes this so easy).
| | * | | BulletSim: move a bunch of common logic out of BSPrim and BSCharacterRobert Adams2012-09-277-416/+361
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and into the parent class BSPhysObject. Rework collision logic to enable extra collision after done colliding. Rename 'Scene' to 'PhysicsScene' to differentiate it from the simulator 'Scene'.
| * | | | Extend attachment regression test to check for appropriate attach event firing.Justin Clark-Casey (justincc)2012-09-291-25/+49
| |/ / / | | | | | | | | | | | | | | | | This reveals that the event is not being fired when an object is attached from ground, which is incorrect. This check is temporairly disabled.
generated by cgit v1.1 at 2024-12-22 08:08:20 +0000