diff options
author | Teravus Ovares | 2009-07-21 03:28:12 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-07-21 03:28:12 +0000 |
commit | 156c393a44c2a17960efdcdbb5b8072fdb1fddc6 (patch) | |
tree | ceda83e9f5f3a94073dbe8b60700eed5b98d8e3d /OpenSim/Region | |
parent | * Fixed a case where a prim was a NullPhysicsActor instead of an OdePrim (diff) | |
download | opensim-SC_OLD-156c393a44c2a17960efdcdbb5b8072fdb1fddc6.zip opensim-SC_OLD-156c393a44c2a17960efdcdbb5b8072fdb1fddc6.tar.gz opensim-SC_OLD-156c393a44c2a17960efdcdbb5b8072fdb1fddc6.tar.bz2 opensim-SC_OLD-156c393a44c2a17960efdcdbb5b8072fdb1fddc6.tar.xz |
* nothing in this commit, re-triggering panda.. which crashed while testing.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 009db41..607dcb2 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -1575,7 +1575,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1575 | return (float)_origheightmap[(int)y * Constants.RegionSize + (int)x]; | 1575 | return (float)_origheightmap[(int)y * Constants.RegionSize + (int)x]; |
1576 | else | 1576 | else |
1577 | return 0; | 1577 | return 0; |
1578 | } | 1578 | } |
1579 | // End recovered. Kitto Flora | 1579 | // End recovered. Kitto Flora |
1580 | 1580 | ||
1581 | public void addCollisionEventReporting(PhysicsActor obj) | 1581 | public void addCollisionEventReporting(PhysicsActor obj) |