aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-01-10 19:58:44 +0000
committerMelanie2010-01-10 19:58:44 +0000
commit2bf49cc1bb2d87877476f68daec2d515f475406d (patch)
tree58d106d8273835b0f613f286cb00e02fe6bf696b /OpenSim
parentAdds land collision events. (diff)
downloadopensim-SC_OLD-2bf49cc1bb2d87877476f68daec2d515f475406d.zip
opensim-SC_OLD-2bf49cc1bb2d87877476f68daec2d515f475406d.tar.gz
opensim-SC_OLD-2bf49cc1bb2d87877476f68daec2d515f475406d.tar.bz2
opensim-SC_OLD-2bf49cc1bb2d87877476f68daec2d515f475406d.tar.xz
Clean CRs from previous patch
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs134
1 files changed, 67 insertions, 67 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a427f12..73f79b3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -139,15 +139,15 @@ namespace OpenSim.Region.Framework.Scenes
139 public uint TimeStampTerse; 139 public uint TimeStampTerse;
140 140
141 [XmlIgnore] 141 [XmlIgnore]
142 public UUID FromItemID; 142 public UUID FromItemID;
143 143
144 [XmlIgnore] 144 [XmlIgnore]
145 public int STATUS_ROTATE_X; 145 public int STATUS_ROTATE_X;
146 146
147 [XmlIgnore] 147 [XmlIgnore]
148 public int STATUS_ROTATE_Y; 148 public int STATUS_ROTATE_Y;
149 149
150 [XmlIgnore] 150 [XmlIgnore]
151 public int STATUS_ROTATE_Z; 151 public int STATUS_ROTATE_Z;
152 152
153 [XmlIgnore] 153 [XmlIgnore]
@@ -1680,19 +1680,19 @@ namespace OpenSim.Region.Framework.Scenes
1680 return false; 1680 return false;
1681 1681
1682 return m_parentGroup.RootPart.DIE_AT_EDGE; 1682 return m_parentGroup.RootPart.DIE_AT_EDGE;
1683 } 1683 }
1684 1684
1685 public int GetAxisRotation(int axis) 1685 public int GetAxisRotation(int axis)
1686 { 1686 {
1687 //Cannot use ScriptBaseClass constants as no referance to it currently. 1687 //Cannot use ScriptBaseClass constants as no referance to it currently.
1688 if (axis == 2)//STATUS_ROTATE_X 1688 if (axis == 2)//STATUS_ROTATE_X
1689 return STATUS_ROTATE_X; 1689 return STATUS_ROTATE_X;
1690 if (axis == 4)//STATUS_ROTATE_Y 1690 if (axis == 4)//STATUS_ROTATE_Y
1691 return STATUS_ROTATE_Y; 1691 return STATUS_ROTATE_Y;
1692 if (axis == 8)//STATUS_ROTATE_Z 1692 if (axis == 8)//STATUS_ROTATE_Z
1693 return STATUS_ROTATE_Z; 1693 return STATUS_ROTATE_Z;
1694 1694
1695 return 0; 1695 return 0;
1696 } 1696 }
1697 1697
1698 public double GetDistanceTo(Vector3 a, Vector3 b) 1698 public double GetDistanceTo(Vector3 a, Vector3 b)
@@ -1934,24 +1934,24 @@ namespace OpenSim.Region.Framework.Scenes
1934 else 1934 else
1935 { 1935 {
1936 } 1936 }
1937 } 1937 }
1938 else 1938 else
1939 { 1939 {
1940 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1940 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1941 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work 1941 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
1942 if (!found) 1942 if (!found)
1943 { 1943 {
1944 DetectedObject detobj = new DetectedObject(); 1944 DetectedObject detobj = new DetectedObject();
1945 detobj.keyUUID = obj.UUID; 1945 detobj.keyUUID = obj.UUID;
1946 detobj.nameStr = obj.Name; 1946 detobj.nameStr = obj.Name;
1947 detobj.ownerUUID = obj._ownerID; 1947 detobj.ownerUUID = obj._ownerID;
1948 detobj.posVector = obj.AbsolutePosition; 1948 detobj.posVector = obj.AbsolutePosition;
1949 detobj.rotQuat = obj.GetWorldRotation(); 1949 detobj.rotQuat = obj.GetWorldRotation();
1950 detobj.velVector = obj.Velocity; 1950 detobj.velVector = obj.Velocity;
1951 detobj.colliderType = 0; 1951 detobj.colliderType = 0;
1952 detobj.groupUUID = obj._groupID; 1952 detobj.groupUUID = obj._groupID;
1953 colliding.Add(detobj); 1953 colliding.Add(detobj);
1954 } 1954 }
1955 } 1955 }
1956 } 1956 }
1957 else 1957 else
@@ -1963,7 +1963,7 @@ namespace OpenSim.Region.Framework.Scenes
1963 ScenePresence av = avlist[i]; 1963 ScenePresence av = avlist[i];
1964 1964
1965 if (av.LocalId == localId) 1965 if (av.LocalId == localId)
1966 { 1966 {
1967 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name)) 1967 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name))
1968 { 1968 {
1969 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1969 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
@@ -1985,24 +1985,24 @@ namespace OpenSim.Region.Framework.Scenes
1985 else 1985 else
1986 { 1986 {
1987 } 1987 }
1988 } 1988 }
1989 else 1989 else
1990 { 1990 {
1991 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1991 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1992 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work 1992 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
1993 if (!found) 1993 if (!found)
1994 { 1994 {
1995 DetectedObject detobj = new DetectedObject(); 1995 DetectedObject detobj = new DetectedObject();
1996 detobj.keyUUID = av.UUID; 1996 detobj.keyUUID = av.UUID;
1997 detobj.nameStr = av.ControllingClient.Name; 1997 detobj.nameStr = av.ControllingClient.Name;
1998 detobj.ownerUUID = av.UUID; 1998 detobj.ownerUUID = av.UUID;
1999 detobj.posVector = av.AbsolutePosition; 1999 detobj.posVector = av.AbsolutePosition;
2000 detobj.rotQuat = av.Rotation; 2000 detobj.rotQuat = av.Rotation;
2001 detobj.velVector = av.Velocity; 2001 detobj.velVector = av.Velocity;
2002 detobj.colliderType = 0; 2002 detobj.colliderType = 0;
2003 detobj.groupUUID = av.ControllingClient.ActiveGroupId; 2003 detobj.groupUUID = av.ControllingClient.ActiveGroupId;
2004 colliding.Add(detobj); 2004 colliding.Add(detobj);
2005 } 2005 }
2006 } 2006 }
2007 2007
2008 } 2008 }
@@ -2099,7 +2099,7 @@ namespace OpenSim.Region.Framework.Scenes
2099 ScenePresence av = avlist[i]; 2099 ScenePresence av = avlist[i];
2100 2100
2101 if (av.LocalId == localId) 2101 if (av.LocalId == localId)
2102 { 2102 {
2103 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name)) 2103 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name))
2104 { 2104 {
2105 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2105 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
@@ -2230,7 +2230,7 @@ namespace OpenSim.Region.Framework.Scenes
2230 ScenePresence av = avlist[i]; 2230 ScenePresence av = avlist[i];
2231 2231
2232 if (av.LocalId == localId) 2232 if (av.LocalId == localId)
2233 { 2233 {
2234 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name)) 2234 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name))
2235 { 2235 {
2236 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2236 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
@@ -2290,7 +2290,7 @@ namespace OpenSim.Region.Framework.Scenes
2290 m_parentGroup.Scene.EventManager.TriggerScriptCollidingEnd(LocalId, EndCollidingMessage); 2290 m_parentGroup.Scene.EventManager.TriggerScriptCollidingEnd(LocalId, EndCollidingMessage);
2291 } 2291 }
2292 } 2292 }
2293 } 2293 }
2294 if ((m_parentGroup.RootPart.ScriptEvents & scriptEvents.land_collision_start) != 0) 2294 if ((m_parentGroup.RootPart.ScriptEvents & scriptEvents.land_collision_start) != 0)
2295 { 2295 {
2296 if (startedColliders.Count > 0) 2296 if (startedColliders.Count > 0)
@@ -2870,13 +2870,13 @@ namespace OpenSim.Region.Framework.Scenes
2870 if (m_parentGroup != null) 2870 if (m_parentGroup != null)
2871 { 2871 {
2872 m_parentGroup.SetAxisRotation(axis, rotate); 2872 m_parentGroup.SetAxisRotation(axis, rotate);
2873 } 2873 }
2874 //Cannot use ScriptBaseClass constants as no referance to it currently. 2874 //Cannot use ScriptBaseClass constants as no referance to it currently.
2875 if (axis == 2)//STATUS_ROTATE_X 2875 if (axis == 2)//STATUS_ROTATE_X
2876 STATUS_ROTATE_X = rotate; 2876 STATUS_ROTATE_X = rotate;
2877 if (axis == 4)//STATUS_ROTATE_Y 2877 if (axis == 4)//STATUS_ROTATE_Y
2878 STATUS_ROTATE_Y = rotate; 2878 STATUS_ROTATE_Y = rotate;
2879 if (axis == 8)//STATUS_ROTATE_Z 2879 if (axis == 8)//STATUS_ROTATE_Z
2880 STATUS_ROTATE_Z = rotate; 2880 STATUS_ROTATE_Z = rotate;
2881 } 2881 }
2882 2882
generated by cgit v1.1 at 2024-07-05 09:03:10 +0000