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/BasicPhysicsPlugin | |
parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
download | opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.zip opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.gz opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.bz2 opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.xz |
Revert "Add localid support to ch0de properly"
This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d.
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin')
-rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs index 6c9d9ab..b6e1cb4 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | |||
@@ -84,7 +84,13 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
84 | */ | 84 | */ |
85 | 85 | ||
86 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | 86 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, |
87 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid) | 87 | Vector3 size, Quaternion rotation) |
88 | { | ||
89 | return AddPrimShape(primName, pbs, position, size, rotation, false); | ||
90 | } | ||
91 | |||
92 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
93 | Vector3 size, Quaternion rotation, bool isPhysical) | ||
88 | { | 94 | { |
89 | return null; | 95 | return null; |
90 | } | 96 | } |