diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index d5b999d..4685b48 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
41 | [Serializable] | 41 | [Serializable] |
42 | public class BSPrim : BSPhysObject | 42 | public class BSPrim : BSPhysObject |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | private static readonly string LogHeader = "[BULLETS PRIM]"; | 45 | private static readonly string LogHeader = "[BULLETS PRIM]"; |
46 | 46 | ||
47 | // _size is what the user passed. Scale is what we pass to the physics engine with the mesh. | 47 | // _size is what the user passed. Scale is what we pass to the physics engine with the mesh. |
@@ -1555,36 +1555,6 @@ public class BSPrim : BSPhysObject | |||
1555 | object ret = null; | 1555 | object ret = null; |
1556 | switch (pFunct) | 1556 | switch (pFunct) |
1557 | { | 1557 | { |
1558 | case BSScene.PhysFunctGetLinksetType: | ||
1559 | { | ||
1560 | BSPrimLinkable myHandle = this as BSPrimLinkable; | ||
1561 | if (myHandle != null) | ||
1562 | { | ||
1563 | ret = (object)myHandle.LinksetType; | ||
1564 | } | ||
1565 | m_log.DebugFormat("{0} Extension.physGetLinksetType, type={1}", LogHeader, ret); | ||
1566 | break; | ||
1567 | } | ||
1568 | case BSScene.PhysFunctSetLinksetType: | ||
1569 | { | ||
1570 | if (pParams.Length > 0) | ||
1571 | { | ||
1572 | BSLinkset.LinksetImplementation linksetType = (BSLinkset.LinksetImplementation)pParams[0]; | ||
1573 | BSPrimLinkable myHandle = this as BSPrimLinkable; | ||
1574 | if (myHandle != null && myHandle.Linkset.IsRoot(myHandle)) | ||
1575 | { | ||
1576 | PhysScene.TaintedObject("BSPrim.PhysFunctSetLinksetType", delegate() | ||
1577 | { | ||
1578 | // Cause the linkset type to change | ||
1579 | m_log.DebugFormat("{0} Extension.physSetLinksetType, oldType={1}, newType={2}", | ||
1580 | LogHeader, myHandle.Linkset.LinksetImpl, linksetType); | ||
1581 | myHandle.ConvertLinkset(linksetType); | ||
1582 | }); | ||
1583 | } | ||
1584 | ret = (object)(int)linksetType; | ||
1585 | } | ||
1586 | break; | ||
1587 | } | ||
1588 | default: | 1558 | default: |
1589 | ret = base.Extension(pFunct, pParams); | 1559 | ret = base.Extension(pFunct, pParams); |
1590 | break; | 1560 | break; |