aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-071-9/+81
* Merge branch 'master' into careminsterMelanie2012-04-241-0/+1
|\
| * Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ...Justin Clark-Casey (justincc)2012-04-241-0/+1
* | Merge branch 'master' into careminsterMelanie2012-04-221-237/+220
|\ \ | |/
| * Comment out spurious Body != IntPtr.Zero code after disableBody(), since disa...Justin Clark-Casey (justincc)2012-04-211-9/+18
| * 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
* | 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 p...Justin Clark-Casey (justincc)2012-04-201-12/+10
* | Merge branch 'master' into careminsterMelanie2012-03-201-10/+16
|\ \ | |/
| * Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at th...Justin Clark-Casey (justincc)2012-03-201-10/+16
* | 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
| * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-0/+1
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+1
|\ \
| * | 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 w...Justin Clark-Casey (justincc)2011-11-221-1/+0
| * Comment out calls to OdeScene.waitForSpaceUnlock() since that method does not...Justin Clark-Casey (justincc)2011-11-211-9/+9
| * Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaini...Justin Clark-Casey (justincc)2011-11-211-1/+0
* | Merge branch 'master' into bigmergeMelanie2011-11-171-10/+1
|\ \ | |/
| * Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow...Justin Clark-Casey (justincc)2011-11-161-10/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-051-0/+3
|\ \ | |/
| * Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPr...Justin Clark-Casey (justincc)2011-11-041-0/+3
* | Merge branch 'master' into bigmergeMelanie2011-10-271-1/+22
|\ \ | |/
| * Fix a bug I introduced yesterday in ODE physics where prim scripts would only...Justin Clark-Casey (justincc)2011-10-271-1/+22
* | Merge branch 'master' into bigmergeMelanie2011-10-261-14/+4
|\ \ | |/
| * 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 Collis...Justin Clark-Casey (justincc)2011-10-251-13/+3
* | 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
* | 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
* | 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 intern...Justin Clark-Casey (justincc)2011-10-151-76/+114
* | Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmergeMelanie2011-10-111-2/+2
|\ \ | |/
| * adjust some whitespace to trigger another build, to check the last failure wa...Justin Clark-Casey (justincc)2011-09-171-2/+2
* | 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
| * Instead of preserving old name in geom_name_map in change size or shape, use ...Justin Clark-Casey (justincc)2011-08-011-7/+3
| * 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 o...Justin Clark-Casey (justincc)2011-08-011-0/+2
| * 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 to...Justin Clark-Casey (justincc)2011-08-011-1/+1
| * If a prim changes size or shape, add actor to _parent_scene.actor_name_map wi...Justin Clark-Casey (justincc)2011-08-011-1/+4
generated by cgit v1.1 at 2024-10-19 02:21:09 +0000