diff options
| author | Melanie | 2013-01-25 00:10:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-25 00:10:32 +0000 |
| commit | 0b8bf69470aa461ac8b6554dce5e56427f39ac74 (patch) | |
| tree | 9e2175c461425d1abc6ffbdb7d19278a9bf82c2e /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: reduce the zeroing threshold for rotational velocity. (diff) | |
| download | opensim-SC-0b8bf69470aa461ac8b6554dce5e56427f39ac74.zip opensim-SC-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.gz opensim-SC-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.bz2 opensim-SC-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 0fe9842..f037348 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4226,6 +4226,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4226 | result.distance = distance2; | 4226 | result.distance = distance2; |
| 4227 | result.HitTF = true; | 4227 | result.HitTF = true; |
| 4228 | result.ipoint = q; | 4228 | result.ipoint = q; |
| 4229 | result.face = i; | ||
| 4229 | //m_log.Info("[FACE]:" + i.ToString()); | 4230 | //m_log.Info("[FACE]:" + i.ToString()); |
| 4230 | //m_log.Info("[POINT]: " + q.ToString()); | 4231 | //m_log.Info("[POINT]: " + q.ToString()); |
| 4231 | //m_log.Info("[DIST]: " + distance2.ToString()); | 4232 | //m_log.Info("[DIST]: " + distance2.ToString()); |