aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-01 15:17:49 +0000
committerTeravus Ovares2008-05-01 15:17:49 +0000
commit56b4f5a2ea582d347c69ce30405e078270090dfa (patch)
tree088745a3b4457b58c95c1eec1de5d5299d3493e9 /OpenSim/Region/Environment/Scenes/InnerScene.cs
parent* Assorted spring cleanings. (diff)
downloadopensim-SC-56b4f5a2ea582d347c69ce30405e078270090dfa.zip
opensim-SC-56b4f5a2ea582d347c69ce30405e078270090dfa.tar.gz
opensim-SC-56b4f5a2ea582d347c69ce30405e078270090dfa.tar.bz2
opensim-SC-56b4f5a2ea582d347c69ce30405e078270090dfa.tar.xz
* committing what I've got so far for DuplicateOnRay so I don't fight the conflict monster later. Not done yet, doesn't crash the server.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 5434a88..da286ad 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -853,7 +853,7 @@ namespace OpenSim.Region.Environment.Scenes
853 return null; 853 return null;
854 } 854 }
855 855
856 public EntityIntersection GetClosestIntersectingPrim(Ray hray, bool frontFacesOnly) 856 public EntityIntersection GetClosestIntersectingPrim(Ray hray, bool frontFacesOnly, bool faceCenters)
857 { 857 {
858 // Primitive Ray Tracing 858 // Primitive Ray Tracing
859 float closestDistance = 280f; 859 float closestDistance = 280f;
@@ -863,7 +863,7 @@ namespace OpenSim.Region.Environment.Scenes
863 if (ent is SceneObjectGroup) 863 if (ent is SceneObjectGroup)
864 { 864 {
865 SceneObjectGroup reportingG = (SceneObjectGroup)ent; 865 SceneObjectGroup reportingG = (SceneObjectGroup)ent;
866 EntityIntersection result = reportingG.TestIntersection(hray, frontFacesOnly); 866 EntityIntersection result = reportingG.TestIntersection(hray, frontFacesOnly, faceCenters);
867 if (result.HitTF) 867 if (result.HitTF)
868 { 868 {
869 if (result.distance < closestDistance) 869 if (result.distance < closestDistance)