aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-241-0/+1
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ↵Justin Clark-Casey (justincc)2012-04-241-0/+1
| | | | | | | | | | | | | | | | from ODEPrim.SetGeom. This occurred in 7a574be3fd from Sat 21 Apr 2012. This should fix collision detection. Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988
* | Merge branch 'master' into careminsterMelanie2012-04-221-237/+220
|\ \ | |/
| * Comment out spurious Body != IntPtr.Zero code after disableBody(), since ↵Justin Clark-Casey (justincc)2012-04-211-9/+18
| | | | | | | | disableBody() sets Body == IntPtr.Zero on all code paths.
| * refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.Justin Clark-Casey (justincc)2012-04-211-115/+117
| |
| * Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.Justin Clark-Casey (justincc)2012-04-211-116/+88
| | | | | | | | | | | | prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock. Therefore, we can remove these checks which were not consistently applied anyway. If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug.
* | Merge branch 'master' into careminsterMelanie2012-04-201-12/+10
|\ \ | |/
| * If a physical prim is manually moved (e.g. by a user) then set the geometry ↵Justin Clark-Casey (justincc)2012-04-201-12/+10
| | | | | | | | | | | | | | position as well as the body position This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once This resolves http://opensimulator.org/mantis/view.php?id=5966
* | Merge branch 'master' into careminsterMelanie2012-03-201-10/+16
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at ↵Justin Clark-Casey (justincc)2012-03-201-10/+16
| | | | | | | | | | | | the same time. Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time.
* | Merge branch 'master' into careminsterMelanie2012-02-241-0/+2
|\ \ | |/
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-0/+2
| | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
| * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+1
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-0/+1
| |/
* | Merge branch 'master' into bigmergeMelanie2011-11-241-11/+9
|\ \ | |/
| * slightly simplify OdeScene.Simulate() by removing bool processtaints, since ↵Justin Clark-Casey (justincc)2011-11-221-1/+0
| | | | | | | | | | | | we can inspect count of taint lists instead. also groups OdeCharacter.CreateOdeStructures() and DestroyOdeStructures() together
| * Comment out calls to OdeScene.waitForSpaceUnlock() since that method does ↵Justin Clark-Casey (justincc)2011-11-211-9/+9
| | | | | | | | nothing right now
| * Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of ↵Justin Clark-Casey (justincc)2011-11-211-1/+0
| | | | | | | | maintaining their own properties
* | Merge branch 'master' into bigmergeMelanie2011-11-171-10/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ↵Justin Clark-Casey (justincc)2011-11-161-10/+1
| | | | | | | | | | | | | | own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId! Instead, just have both subclasses use the PhysicsActor.LocalID property. This restores collision functionality that fell away in 45c7789 yesterday
* | Merge branch 'master' into bigmergeMelanie2011-11-051-0/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add comment for experimental effect of removing the Thread.Sleep(20) in ↵Justin Clark-Casey (justincc)2011-11-041-0/+3
| | | | | | | | ODEPrim.changevelocity()
* | Merge branch 'master' into bigmergeMelanie2011-10-271-1/+22
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fix a bug I introduced yesterday in ODE physics where prim scripts would ↵Justin Clark-Casey (justincc)2011-10-271-1/+22
| | | | | | | | only receive the very first collision.
* | Merge branch 'master' into bigmergeMelanie2011-10-261-14/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Remove unused fields from CollisionEventUpdateJustin Clark-Casey (justincc)2011-10-251-1/+1
| |
| * When sending object collision updates, don't null out and recreate the ↵Justin Clark-Casey (justincc)2011-10-251-13/+3
| | | | | | | | CollisionEventUpdate() if the number of collisions falls to zero. Reuse the existing one instead.
* | Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmergeMelanie2011-10-251-18/+13
|\ \ | |/
| * Remove unnecessary lock of OdeLock in OdePrim.changeadd()Justin Clark-Casey (justincc)2011-10-181-18/+13
| | | | | | | | This taint can only ever be processed from the OdeScene.Simulate() loop, which already locks OdeLock.
* | Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmergeMelanie2011-10-251-0/+2
|\ \ | |/
| * minor: method doc to explain a lock of OdeLockJustin Clark-Casey (justincc)2011-10-181-0/+2
| |
* | Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmergeMelanie2011-10-251-9/+4
|\ \ | |/
| * Remove the unused CollisionLocker from ODEJustin Clark-Casey (justincc)2011-10-181-9/+4
| | | | | | | | Despite its name, this wasn't actually being used in any collision checking
* | Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmergeMelanie2011-10-251-19/+17
|\ \ | |/
| * restrict unnecessary access levels on ODEPrim fields/propertiesJustin Clark-Casey (justincc)2011-10-151-19/+17
| |
* | Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmergeMelanie2011-10-251-76/+114
|\ \ | |/
| * refactor: make methods that do not need to be public in ODE private or ↵Justin Clark-Casey (justincc)2011-10-151-76/+114
| | | | | | | | internal to aid code reading/analysis. Remove some unused method arguments
* | 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.
generated by cgit v1.1 at 2024-12-20 01:44:21 +0000