aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.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/SceneObjectGroup.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/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index e53cfaa..5d39790 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -543,7 +543,7 @@ namespace OpenSim.Region.Environment.Scenes
543 return finalScale; 543 return finalScale;
544 544
545 } 545 }
546 public EntityIntersection TestIntersection(Ray hRay, bool frontFacesOnly) 546 public EntityIntersection TestIntersection(Ray hRay, bool frontFacesOnly, bool faceCenters)
547 { 547 {
548 // We got a request from the inner_scene to raytrace along the Ray hRay 548 // We got a request from the inner_scene to raytrace along the Ray hRay
549 // We're going to check all of the prim in this group for intersection with the ray 549 // We're going to check all of the prim in this group for intersection with the ray
@@ -565,7 +565,7 @@ namespace OpenSim.Region.Environment.Scenes
565 // Telling the prim to raytrace. 565 // Telling the prim to raytrace.
566 //EntityIntersection inter = part.TestIntersection(hRay, parentrotation); 566 //EntityIntersection inter = part.TestIntersection(hRay, parentrotation);
567 567
568 EntityIntersection inter = part.TestIntersectionOBB(hRay, parentrotation,frontFacesOnly); 568 EntityIntersection inter = part.TestIntersectionOBB(hRay, parentrotation,frontFacesOnly, faceCenters);
569 569
570 // This may need to be updated to the maximum draw distance possible.. 570 // This may need to be updated to the maximum draw distance possible..
571 // We might (and probably will) be checking for prim creation from other sims 571 // We might (and probably will) be checking for prim creation from other sims