aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmergeMelanie2011-10-111-2/+2
|\
| * adjust some whitespace to trigger another build, to check the last failure ↵Justin Clark-Casey (justincc)2011-09-171-2/+2
| | | | | | | | was just a glitch
* | Resolve merge commits, stage 1Tom2011-09-041-152/+151
|\ \ | |/
| * Move common gemo/agent map name code into CreateGeom()Justin Clark-Casey (justincc)2011-08-011-11/+5
| | | | | | | | Fix build break.
| * Instead of preserving old name in geom_name_map in change size or shape, use ↵Justin Clark-Casey (justincc)2011-08-011-7/+3
| | | | | | | | | | | | the Name property instead. This is equivalent since the prim 'name' is never changed. In fact, this propery is never used for prims
| * On geom removal, remove the name from the OdeScene.geom_name_map tooJustin Clark-Casey (justincc)2011-08-011-0/+1
| |
| * remove the unused ODEPrim.prev_geom fieldJustin Clark-Casey (justincc)2011-08-011-3/+0
| |
| * When an ODE geom is removed (as when a non-phantom prim is deleted, resized ↵Justin Clark-Casey (justincc)2011-08-011-0/+2
| | | | | | | | | | | | or shape changed, also remove the OdeScene.actor_name_map entry pointing to the phys actor This is to stop a small memory leak over time when prims are deleted or phantom-toggled
| * refactor: centralize prim geom removal code from four places to oneJustin Clark-Casey (justincc)2011-08-011-26/+37
| |
| * minor: add note to RemovePrimThreadLocked() to the effect that it contrary ↵Justin Clark-Casey (justincc)2011-08-011-1/+1
| | | | | | | | to the summary, it is being called from within Simulate() lock (OdeLock)
| * If a prim changes size or shape, add actor to _parent_scene.actor_name_map ↵Justin Clark-Casey (justincc)2011-08-011-1/+4
| | | | | | | | | | | | | | | | with new prim_geom key, as the old one becomes invalid. This resolves http://opensimulator.org/mantis/view.php?id=5603 where changing size or shape would stop collision_start being fired in a running script. In both this and existing code we are not removing old actors from actor_name_map when the existing prim_geom is removed, which leads to a small memory leak over time. This needs to be fixed.
| * Remove _mesh field since the mesh data no longer needs to be stored after ↵Justin Clark-Casey (justincc)2011-07-311-49/+16
| | | | | | | | | | | | it's initially used. This may improve memory usage for regions using mesh and sculpts, though I suspect that it doesn't address the current memory leak.
| * refactor: Remove argument to pass in an initial mesh to OdePrim since this ↵Justin Clark-Casey (justincc)2011-07-311-2/+1
| | | | | | | | | | | | is no longer required and it prevents removal of the _mesh field (which is only used temporarily) If passing in a mesh becomes important again in the future then this can be reinstated.
| * minor: correct method doc for last commitJustin Clark-Casey (justincc)2011-07-311-1/+1
| |
| * refactor: rename CreateGeom _mesh argument to mesh, so as to not confuse ↵Justin Clark-Casey (justincc)2011-07-311-3/+3
| | | | | | | | this with the pre-existing _mesh field
| * minor: method docJustin Clark-Casey (justincc)2011-07-311-3/+20
| |
| * Refactor: Replace instances of m_isphysical with IsPhysical rather than have ↵Justin Clark-Casey (justincc)2011-07-301-33/+40
| | | | | | | | | | | | some code reference the private var and other the public var without any functionality difference. Add some method doc to IsPhysical
| * refactor: Rename ODEPrim.ParentPrim() to AddChildPrim() for code readabilityJustin Clark-Casey (justincc)2011-07-301-11/+14
| |
| * minor: remove mono compiler warnings, some code spacing adjustmentsJustin Clark-Casey (justincc)2011-07-301-1/+1
| |
| * minor: Add method doc to collision subscription methods. Change method case ↵Justin Clark-Casey (justincc)2011-07-301-2/+2
| | | | | | | | to reflect OpenSim standards.
| * Fix physics proxy regeneration when a mesh with more than one submesh is resizedJustin Clark-Casey (justincc)2011-07-161-0/+1
| | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5584
| * minor: remove whitespace to trigger another buildJustin Clark-Casey (justincc)2011-07-121-1/+0
| |
| * When a mesh object is added to a scene, delay adding the physics actor until ↵Justin Clark-Casey (justincc)2011-07-121-10/+11
| | | | | | | | | | | | the sculpt data has been added to the shape (possibly via an async asset service request) This prevents spurious 'no asset data' for meshes added on startup.
| * When a sculpt/mesh texture is received by a part on a callback request, ↵Justin Clark-Casey (justincc)2011-07-111-1/+2
| | | | | | | | | | | | | | don't do the unnecessary work of copying the base shape. Just setting the new base shape is enough to reinsert the sculpt data and set the taint. Also cleans up a few more left-in debugging messages.
| * comment out accidential ProcessTaints physics debug line left in codeJustin Clark-Casey (justincc)2011-07-111-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-091-61/+47
|\ \ | |/
| * minor: code tidy and inserted log lines for future use.Justin Clark-Casey (justincc)2011-07-091-18/+34
| | | | | | | | | | | | | | | | Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory When phantom is toggled, the sculptdata is regenerated before remeshing. But on resize, the sculptdata is not regenerated. So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
| * minor: code tidy up - remove a couple of Console.WriteLine() accidentally ↵Justin Clark-Casey (justincc)2011-07-081-47/+15
| | | | | | | | added in the last commit
| * minor: commented out log lines for future use and very small code tidyJustin Clark-Casey (justincc)2011-07-081-4/+6
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-061-4/+4
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-041-4/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-021-2/+2
|\ \ | |/
| * Replace CalculateMass with a more accurate version, contributed by Ubit.Melanie2010-10-021-234/+219
| | | | | | | | Thank you.
* | Replace CalculateMass with a more accurate version, contributed by Ubit.Melanie2010-10-021-234/+219
| | | | | | | | Thank you.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-251-42/+45
|\ \ | |/
| * Add prim name to OdePrim Error and Warning messages.Justin Clark-Casey (justincc)2010-09-251-42/+45
| | | | | | | | This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-271-13/+13
|\ \ | |/
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-06-251-13/+13
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-151-2/+2
|\ \ | |/
| * * Added a better check to the SimianGrid connectors to test if they are ↵John Hurliman2010-03-121-2/+2
| | | | | | | | | | | | enabled or not. This method should work equally well with standalone or robust mode * Applying #4602 from Misterblu to add collision detection to BulletDotNET
* | Resolved mergeKitto Flora2010-03-121-7/+2
|\ \
| * \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-061-1/+6
| |\ \ |/ / / | | _
| * Revolution is on the roll again! :)Revolution2010-02-141-0/+5
| | | | | | | | | | | | | | | | Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events). Direct flames and kudos to Revolution, please Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2010-02-081-0/+2
|\ \ | |/
| * Applying patch #4534 by Misterblue to fix ODE physics stickinessJohn Hurliman2010-02-041-0/+2
| |
* | Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add ↵Kitto Flora2010-01-211-0/+10
| | | | | | | | associated methods.
* | Merge branch 'master' into careminsterMelanie2010-01-031-280/+282
|\ \ | |/
| * Formatting cleanup. Add copyright headers.Jeff Ames2010-01-041-280/+282
| |
* | Fix conflictsKitto Flora2009-12-221-1/+1
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-221-6/+9
| |\ \ | | |/