diff options
author | Robert Adams | 2013-02-06 22:34:03 -0800 |
---|---|---|
committer | Robert Adams | 2013-02-07 11:10:14 -0800 |
commit | af73ea909cad78eee78bd4e9d9e3a42cf8856263 (patch) | |
tree | d7ea386cb6dba9d3cdd94ef096287157dddc10c7 /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
parent | Websocket Echo module should not be on by default. (diff) | |
download | opensim-SC-af73ea909cad78eee78bd4e9d9e3a42cf8856263.zip opensim-SC-af73ea909cad78eee78bd4e9d9e3a42cf8856263.tar.gz opensim-SC-af73ea909cad78eee78bd4e9d9e3a42cf8856263.tar.bz2 opensim-SC-af73ea909cad78eee78bd4e9d9e3a42cf8856263.tar.xz |
Change passed PhysicsParameter value from float to the more general string value
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index 965c382..601c78c 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
@@ -641,24 +641,6 @@ public static class BSParam | |||
641 | return (b == ConfigurationParameters.numericTrue ? true : false); | 641 | return (b == ConfigurationParameters.numericTrue ? true : false); |
642 | } | 642 | } |
643 | 643 | ||
644 | private static void ResetBroadphasePoolTainted(BSScene pPhysScene, float v) | ||
645 | { | ||
646 | BSScene physScene = pPhysScene; | ||
647 | physScene.TaintedObject("BSParam.ResetBroadphasePoolTainted", delegate() | ||
648 | { | ||
649 | physScene.PE.ResetBroadphasePool(physScene.World); | ||
650 | }); | ||
651 | } | ||
652 | |||
653 | private static void ResetConstraintSolverTainted(BSScene pPhysScene, float v) | ||
654 | { | ||
655 | BSScene physScene = pPhysScene; | ||
656 | physScene.TaintedObject("BSParam.ResetConstraintSolver", delegate() | ||
657 | { | ||
658 | physScene.PE.ResetConstraintSolver(physScene.World); | ||
659 | }); | ||
660 | } | ||
661 | |||
662 | // Search through the parameter definitions and return the matching | 644 | // Search through the parameter definitions and return the matching |
663 | // ParameterDefn structure. | 645 | // ParameterDefn structure. |
664 | // Case does not matter as names are compared after converting to lower case. | 646 | // Case does not matter as names are compared after converting to lower case. |
@@ -722,6 +704,22 @@ public static class BSParam | |||
722 | } | 704 | } |
723 | } | 705 | } |
724 | 706 | ||
707 | private static void ResetBroadphasePoolTainted(BSScene pPhysScene, float v) | ||
708 | { | ||
709 | BSScene physScene = pPhysScene; | ||
710 | physScene.TaintedObject("BSParam.ResetBroadphasePoolTainted", delegate() | ||
711 | { | ||
712 | physScene.PE.ResetBroadphasePool(physScene.World); | ||
713 | }); | ||
714 | } | ||
725 | 715 | ||
716 | private static void ResetConstraintSolverTainted(BSScene pPhysScene, float v) | ||
717 | { | ||
718 | BSScene physScene = pPhysScene; | ||
719 | physScene.TaintedObject("BSParam.ResetConstraintSolver", delegate() | ||
720 | { | ||
721 | physScene.PE.ResetConstraintSolver(physScene.World); | ||
722 | }); | ||
723 | } | ||
726 | } | 724 | } |
727 | } | 725 | } |