diff options
| author | Justin Clark-Casey (justincc) | 2011-08-01 06:47:45 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-01 06:47:45 +0100 |
| commit | 40a78db1828cfd9b159cfc0f0fc64409aa2d1489 (patch) | |
| tree | 5019d1ff3ed6360b2cd2e49441607bcae73b316a /OpenSim | |
| parent | On geom removal, remove the name from the OdeScene.geom_name_map too (diff) | |
| download | opensim-SC_OLD-40a78db1828cfd9b159cfc0f0fc64409aa2d1489.zip opensim-SC_OLD-40a78db1828cfd9b159cfc0f0fc64409aa2d1489.tar.gz opensim-SC_OLD-40a78db1828cfd9b159cfc0f0fc64409aa2d1489.tar.bz2 opensim-SC_OLD-40a78db1828cfd9b159cfc0f0fc64409aa2d1489.tar.xz | |
comment out unused code in OdeScene.TriCallback()
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 3402be2..6e603e8 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -1423,18 +1423,18 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1423 | 1423 | ||
| 1424 | public int TriCallback(IntPtr trimesh, IntPtr refObject, int triangleIndex) | 1424 | public int TriCallback(IntPtr trimesh, IntPtr refObject, int triangleIndex) |
| 1425 | { | 1425 | { |
| 1426 | String name1 = null; | 1426 | // String name1 = null; |
| 1427 | String name2 = null; | 1427 | // String name2 = null; |
| 1428 | 1428 | // | |
| 1429 | if (!geom_name_map.TryGetValue(trimesh, out name1)) | 1429 | // if (!geom_name_map.TryGetValue(trimesh, out name1)) |
| 1430 | { | 1430 | // { |
| 1431 | name1 = "null"; | 1431 | // name1 = "null"; |
| 1432 | } | 1432 | // } |
| 1433 | 1433 | // | |
| 1434 | if (!geom_name_map.TryGetValue(refObject, out name2)) | 1434 | // if (!geom_name_map.TryGetValue(refObject, out name2)) |
| 1435 | { | 1435 | // { |
| 1436 | name2 = "null"; | 1436 | // name2 = "null"; |
| 1437 | } | 1437 | // } |
| 1438 | 1438 | ||
| 1439 | // m_log.InfoFormat("TriCallback: A collision was detected between {1} and {2}. Index was {3}", 0, name1, name2, triangleIndex); | 1439 | // m_log.InfoFormat("TriCallback: A collision was detected between {1} and {2}. Index was {3}", 0, name1, name2, triangleIndex); |
| 1440 | 1440 | ||