From 455da9dd20dc6a992c7adc1a8fd851ab586392a1 Mon Sep 17 00:00:00 2001
From: teravus <teravus@gmail.com>
Date: Sat, 16 Mar 2013 11:09:49 -0400
Subject: [PATCH] * Ignores VolumeDetect enabled prim in the camera raycast
 call.    Note: The SceneRaycast call doesn't have a filter option in the
 interface and physics will use the lower level one for all sorts of goodies
 so it wouldn't be appropriate to ignore it at the physics layer yet..  though
 that would be better once the API has filters.

---
 .../Region/Framework/Scenes/ScenePresence.cs  | 45 ++++++++++++++-----
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 91f9c0bb40..230cb23b96 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1526,17 +1526,42 @@ namespace OpenSim.Region.Framework.Scenes
             m_doingCamRayCast = false;
             if (hitYN && localid != LocalId)
             {
-                CameraConstraintActive = true;
-                pNormal.X = (float)Math.Round(pNormal.X, 2);
-                pNormal.Y = (float)Math.Round(pNormal.Y, 2);
-                pNormal.Z = (float)Math.Round(pNormal.Z, 2);
-                pNormal.Normalize();
-                collisionPoint.X = (float)Math.Round(collisionPoint.X, 1);
-                collisionPoint.Y = (float)Math.Round(collisionPoint.Y, 1);
-                collisionPoint.Z = (float)Math.Round(collisionPoint.Z, 1);
+                SceneObjectGroup group = m_scene.GetGroupByPrim(localid);
+                bool IsPrim = group != null;
+                if (IsPrim)
+                {
+                    SceneObjectPart part = group.GetPart(localid);
+                    if (part != null && !part.VolumeDetectActive)
+                    {
+                        CameraConstraintActive = true;
+                        pNormal.X = (float) Math.Round(pNormal.X, 2);
+                        pNormal.Y = (float) Math.Round(pNormal.Y, 2);
+                        pNormal.Z = (float) Math.Round(pNormal.Z, 2);
+                        pNormal.Normalize();
+                        collisionPoint.X = (float) Math.Round(collisionPoint.X, 1);
+                        collisionPoint.Y = (float) Math.Round(collisionPoint.Y, 1);
+                        collisionPoint.Z = (float) Math.Round(collisionPoint.Z, 1);
 
-                Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z, Vector3.Dot(collisionPoint, pNormal));
-                UpdateCameraCollisionPlane(plane);
+                        Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z,
+                                                    Vector3.Dot(collisionPoint, pNormal));
+                        UpdateCameraCollisionPlane(plane);
+                    }
+                }
+                else
+                {
+                    CameraConstraintActive = true;
+                    pNormal.X = (float) Math.Round(pNormal.X, 2);
+                    pNormal.Y = (float) Math.Round(pNormal.Y, 2);
+                    pNormal.Z = (float) Math.Round(pNormal.Z, 2);
+                    pNormal.Normalize();
+                    collisionPoint.X = (float) Math.Round(collisionPoint.X, 1);
+                    collisionPoint.Y = (float) Math.Round(collisionPoint.Y, 1);
+                    collisionPoint.Z = (float) Math.Round(collisionPoint.Z, 1);
+
+                    Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z,
+                                                Vector3.Dot(collisionPoint, pNormal));
+                    UpdateCameraCollisionPlane(plane);
+                }
             }
             else if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
                      !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE))