diff options
author | Oren Hurvitz | 2014-04-22 20:04:12 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-23 16:37:36 +0300 |
commit | 998d7009a65def0a4debc9369d35b63611db5b55 (patch) | |
tree | d1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | |
parent | Workaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff) | |
download | opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.zip opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2 opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz |
Eliminated many warnings
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs index fbe320b..b344ba1 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | |||
@@ -554,7 +554,10 @@ public class BSShapeMesh : BSShape | |||
554 | // ============================================================================================================ | 554 | // ============================================================================================================ |
555 | public class BSShapeHull : BSShape | 555 | public class BSShapeHull : BSShape |
556 | { | 556 | { |
557 | #pragma warning disable 414 | ||
557 | private static string LogHeader = "[BULLETSIM SHAPE HULL]"; | 558 | private static string LogHeader = "[BULLETSIM SHAPE HULL]"; |
559 | #pragma warning restore 414 | ||
560 | |||
558 | public static Dictionary<System.UInt64, BSShapeHull> Hulls = new Dictionary<System.UInt64, BSShapeHull>(); | 561 | public static Dictionary<System.UInt64, BSShapeHull> Hulls = new Dictionary<System.UInt64, BSShapeHull>(); |
559 | 562 | ||
560 | public BSShapeHull(BulletShape pShape) : base(pShape) | 563 | public BSShapeHull(BulletShape pShape) : base(pShape) |
@@ -1002,7 +1005,10 @@ public class BSShapeCompound : BSShape | |||
1002 | // ============================================================================================================ | 1005 | // ============================================================================================================ |
1003 | public class BSShapeConvexHull : BSShape | 1006 | public class BSShapeConvexHull : BSShape |
1004 | { | 1007 | { |
1008 | #pragma warning disable 414 | ||
1005 | private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]"; | 1009 | private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]"; |
1010 | #pragma warning restore 414 | ||
1011 | |||
1006 | public static Dictionary<System.UInt64, BSShapeConvexHull> ConvexHulls = new Dictionary<System.UInt64, BSShapeConvexHull>(); | 1012 | public static Dictionary<System.UInt64, BSShapeConvexHull> ConvexHulls = new Dictionary<System.UInt64, BSShapeConvexHull>(); |
1007 | 1013 | ||
1008 | public BSShapeConvexHull(BulletShape pShape) : base(pShape) | 1014 | public BSShapeConvexHull(BulletShape pShape) : base(pShape) |
@@ -1098,7 +1104,10 @@ public class BSShapeConvexHull : BSShape | |||
1098 | // ============================================================================================================ | 1104 | // ============================================================================================================ |
1099 | public class BSShapeGImpact : BSShape | 1105 | public class BSShapeGImpact : BSShape |
1100 | { | 1106 | { |
1107 | #pragma warning disable 414 | ||
1101 | private static string LogHeader = "[BULLETSIM SHAPE GIMPACT]"; | 1108 | private static string LogHeader = "[BULLETSIM SHAPE GIMPACT]"; |
1109 | #pragma warning restore 414 | ||
1110 | |||
1102 | public static Dictionary<System.UInt64, BSShapeGImpact> GImpacts = new Dictionary<System.UInt64, BSShapeGImpact>(); | 1111 | public static Dictionary<System.UInt64, BSShapeGImpact> GImpacts = new Dictionary<System.UInt64, BSShapeGImpact>(); |
1103 | 1112 | ||
1104 | public BSShapeGImpact(BulletShape pShape) : base(pShape) | 1113 | public BSShapeGImpact(BulletShape pShape) : base(pShape) |
@@ -1205,8 +1214,12 @@ public class BSShapeGImpact : BSShape | |||
1205 | // ============================================================================================================ | 1214 | // ============================================================================================================ |
1206 | public class BSShapeAvatar : BSShape | 1215 | public class BSShapeAvatar : BSShape |
1207 | { | 1216 | { |
1217 | #pragma warning disable 414 | ||
1208 | private static string LogHeader = "[BULLETSIM SHAPE AVATAR]"; | 1218 | private static string LogHeader = "[BULLETSIM SHAPE AVATAR]"; |
1209 | public BSShapeAvatar() : base() | 1219 | #pragma warning restore 414 |
1220 | |||
1221 | public BSShapeAvatar() | ||
1222 | : base() | ||
1210 | { | 1223 | { |
1211 | } | 1224 | } |
1212 | public static BSShape GetReference(BSPhysObject prim) | 1225 | public static BSShape GetReference(BSPhysObject prim) |