diff options
author | Melanie | 2011-07-15 19:35:49 +0200 |
---|---|---|
committer | Melanie | 2011-07-15 19:35:49 +0200 |
commit | 8dff9d564dfbf4841f03a919df44e8ae3d76de25 (patch) | |
tree | 787a083ac9efc5e3a67f271e7fe6bc4a22d0ea94 /OpenSim/Region/Physics/PhysXPlugin | |
parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
download | opensim-SC_OLD-8dff9d564dfbf4841f03a919df44e8ae3d76de25.zip opensim-SC_OLD-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.gz opensim-SC_OLD-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.bz2 opensim-SC_OLD-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.xz |
Revert "Add localid support to ch0de properly"
This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d.
Diffstat (limited to 'OpenSim/Region/Physics/PhysXPlugin')
-rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs index beb3404..4de4b01 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXScene.cs | |||
@@ -108,7 +108,13 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
108 | } | 108 | } |
109 | 109 | ||
110 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 110 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
111 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid) | 111 | Vector3 size, Quaternion rotation) //To be removed |
112 | { | ||
113 | return AddPrimShape(primName, pbs, position, size, rotation, false); | ||
114 | } | ||
115 | |||
116 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
117 | Vector3 size, Quaternion rotation, bool isPhysical) | ||
112 | { | 118 | { |
113 | return AddPrim(position, size, rotation); | 119 | return AddPrim(position, size, rotation); |
114 | } | 120 | } |