diff options
author | Robert Adams | 2013-08-20 13:09:40 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-11 09:12:05 -0700 |
commit | d09c35f5063114880aecb94a938bfc49f5af5f7d (patch) | |
tree | 8af9cf90bdbde7b63bb49844d550d36529cadd46 /OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | |
parent | BulletSim: add ID parameter to TaintedObject calls so logging will include Lo... (diff) | |
download | opensim-SC_OLD-d09c35f5063114880aecb94a938bfc49f5af5f7d.zip opensim-SC_OLD-d09c35f5063114880aecb94a938bfc49f5af5f7d.tar.gz opensim-SC_OLD-d09c35f5063114880aecb94a938bfc49f5af5f7d.tar.bz2 opensim-SC_OLD-d09c35f5063114880aecb94a938bfc49f5af5f7d.tar.xz |
BulletSim: pass both root and child BSPhysObjects to Extension function. Update routines to use the new parameters list from above change.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs index 840265b..126b146 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | |||
@@ -288,7 +288,7 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
288 | switch (pFunct) | 288 | switch (pFunct) |
289 | { | 289 | { |
290 | // physGetLinksetType(); | 290 | // physGetLinksetType(); |
291 | // pParams = [] | 291 | // pParams = [ BSPhysObject root, null ] |
292 | case ExtendedPhysics.PhysFunctGetLinksetType: | 292 | case ExtendedPhysics.PhysFunctGetLinksetType: |
293 | { | 293 | { |
294 | ret = (object)LinksetType; | 294 | ret = (object)LinksetType; |
@@ -296,12 +296,12 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
296 | break; | 296 | break; |
297 | } | 297 | } |
298 | // physSetLinksetType(type); | 298 | // physSetLinksetType(type); |
299 | // pParams = [ BSPhysObject child, integer type ] | 299 | // pParams = [ BSPhysObject root, null, integer type ] |
300 | case ExtendedPhysics.PhysFunctSetLinksetType: | 300 | case ExtendedPhysics.PhysFunctSetLinksetType: |
301 | { | 301 | { |
302 | if (pParams.Length > 0) | 302 | if (pParams.Length > 2) |
303 | { | 303 | { |
304 | BSLinkset.LinksetImplementation linksetType = (BSLinkset.LinksetImplementation)pParams[0]; | 304 | BSLinkset.LinksetImplementation linksetType = (BSLinkset.LinksetImplementation)pParams[2]; |
305 | if (Linkset.IsRoot(this)) | 305 | if (Linkset.IsRoot(this)) |
306 | { | 306 | { |
307 | PhysScene.TaintedObject(LocalID, "BSPrim.PhysFunctSetLinksetType", delegate() | 307 | PhysScene.TaintedObject(LocalID, "BSPrim.PhysFunctSetLinksetType", delegate() |
@@ -317,21 +317,21 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
317 | break; | 317 | break; |
318 | } | 318 | } |
319 | // physChangeLinkType(linknum, typeCode); | 319 | // physChangeLinkType(linknum, typeCode); |
320 | // pParams = [ BSPhysObject child, integer linkType ] | 320 | // pParams = [ BSPhysObject root, BSPhysObject child, integer linkType ] |
321 | case ExtendedPhysics.PhysFunctChangeLinkType: | 321 | case ExtendedPhysics.PhysFunctChangeLinkType: |
322 | { | 322 | { |
323 | ret = Linkset.Extension(pFunct, pParams); | 323 | ret = Linkset.Extension(pFunct, pParams); |
324 | break; | 324 | break; |
325 | } | 325 | } |
326 | // physGetLinkType(linknum); | 326 | // physGetLinkType(linknum); |
327 | // pParams = [ BSPhysObject child ] | 327 | // pParams = [ BSPhysObject root, BSPhysObject child ] |
328 | case ExtendedPhysics.PhysFunctGetLinkType: | 328 | case ExtendedPhysics.PhysFunctGetLinkType: |
329 | { | 329 | { |
330 | ret = Linkset.Extension(pFunct, pParams); | 330 | ret = Linkset.Extension(pFunct, pParams); |
331 | break; | 331 | break; |
332 | } | 332 | } |
333 | // physChangeLinkParams(linknum, [code, value, code, value, ...]); | 333 | // physChangeLinkParams(linknum, [code, value, code, value, ...]); |
334 | // pParams = [ BSPhysObject child, object[] [ string op, object opParam, string op, object opParam, ... ] ] | 334 | // pParams = [ BSPhysObject root, BSPhysObject child, object[] [ string op, object opParam, string op, object opParam, ... ] ] |
335 | case ExtendedPhysics.PhysFunctChangeLinkParams: | 335 | case ExtendedPhysics.PhysFunctChangeLinkParams: |
336 | { | 336 | { |
337 | ret = Linkset.Extension(pFunct, pParams); | 337 | ret = Linkset.Extension(pFunct, pParams); |