aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2010-01-03 21:43:39 +0000
committerMelanie2010-01-03 21:43:39 +0000
commit61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11 (patch)
tree7780b88dc26de91fe0b95a0a234a7f995adf5d22 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentAdd virtual method StateChange to ScriptBaseClass (diff)
parentCause llSetText to send prim updates. (diff)
downloadopensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.zip
opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.gz
opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.bz2
opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs45
1 files changed, 26 insertions, 19 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3e330eb..eda3d60 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1902,11 +1902,11 @@ namespace OpenSim.Region.Framework.Scenes
1902 string data = ""; 1902 string data = "";
1903 if (obj != null) 1903 if (obj != null)
1904 { 1904 {
1905 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 1905 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
1906 { 1906 {
1907 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1907 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1908 //If it is 1, it is to accept ONLY collisions from this object 1908 //If it is 1, it is to accept ONLY collisions from this object
1909 if(found) 1909 if (found)
1910 { 1910 {
1911 DetectedObject detobj = new DetectedObject(); 1911 DetectedObject detobj = new DetectedObject();
1912 detobj.keyUUID = obj.UUID; 1912 detobj.keyUUID = obj.UUID;
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.Framework.Scenes
1928 { 1928 {
1929 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1929 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1930 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work 1930 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
1931 if(found) 1931 if (found)
1932 { 1932 {
1933 DetectedObject detobj = new DetectedObject(); 1933 DetectedObject detobj = new DetectedObject();
1934 detobj.keyUUID = obj.UUID; 1934 detobj.keyUUID = obj.UUID;
@@ -1953,11 +1953,11 @@ namespace OpenSim.Region.Framework.Scenes
1953 1953
1954 if (av.LocalId == localId) 1954 if (av.LocalId == localId)
1955 { 1955 {
1956 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 1956 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
1957 { 1957 {
1958 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1958 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1959 //If it is 1, it is to accept ONLY collisions from this avatar 1959 //If it is 1, it is to accept ONLY collisions from this avatar
1960 if(found) 1960 if (found)
1961 { 1961 {
1962 DetectedObject detobj = new DetectedObject(); 1962 DetectedObject detobj = new DetectedObject();
1963 detobj.keyUUID = av.UUID; 1963 detobj.keyUUID = av.UUID;
@@ -1979,7 +1979,7 @@ namespace OpenSim.Region.Framework.Scenes
1979 { 1979 {
1980 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1980 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1981 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work 1981 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
1982 if(found) 1982 if (found)
1983 { 1983 {
1984 DetectedObject detobj = new DetectedObject(); 1984 DetectedObject detobj = new DetectedObject();
1985 detobj.keyUUID = av.UUID; 1985 detobj.keyUUID = av.UUID;
@@ -2007,7 +2007,7 @@ namespace OpenSim.Region.Framework.Scenes
2007 2007
2008 if (m_parentGroup.Scene == null) 2008 if (m_parentGroup.Scene == null)
2009 return; 2009 return;
2010 if(m_parentGroup.PassCollision == true) 2010 if (m_parentGroup.PassCollision == true)
2011 { 2011 {
2012 //TODO: Add pass to root prim! 2012 //TODO: Add pass to root prim!
2013 } 2013 }
@@ -2038,11 +2038,11 @@ namespace OpenSim.Region.Framework.Scenes
2038 string data = ""; 2038 string data = "";
2039 if (obj != null) 2039 if (obj != null)
2040 { 2040 {
2041 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 2041 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
2042 { 2042 {
2043 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2043 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2044 //If it is 1, it is to accept ONLY collisions from this object 2044 //If it is 1, it is to accept ONLY collisions from this object
2045 if(found) 2045 if (found)
2046 { 2046 {
2047 DetectedObject detobj = new DetectedObject(); 2047 DetectedObject detobj = new DetectedObject();
2048 detobj.keyUUID = obj.UUID; 2048 detobj.keyUUID = obj.UUID;
@@ -2064,7 +2064,7 @@ namespace OpenSim.Region.Framework.Scenes
2064 { 2064 {
2065 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2065 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2066 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work 2066 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
2067 if(found) 2067 if (found)
2068 { 2068 {
2069 DetectedObject detobj = new DetectedObject(); 2069 DetectedObject detobj = new DetectedObject();
2070 detobj.keyUUID = obj.UUID; 2070 detobj.keyUUID = obj.UUID;
@@ -2089,11 +2089,11 @@ namespace OpenSim.Region.Framework.Scenes
2089 2089
2090 if (av.LocalId == localId) 2090 if (av.LocalId == localId)
2091 { 2091 {
2092 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 2092 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
2093 { 2093 {
2094 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2094 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2095 //If it is 1, it is to accept ONLY collisions from this avatar 2095 //If it is 1, it is to accept ONLY collisions from this avatar
2096 if(found) 2096 if (found)
2097 { 2097 {
2098 DetectedObject detobj = new DetectedObject(); 2098 DetectedObject detobj = new DetectedObject();
2099 detobj.keyUUID = av.UUID; 2099 detobj.keyUUID = av.UUID;
@@ -2115,7 +2115,7 @@ namespace OpenSim.Region.Framework.Scenes
2115 { 2115 {
2116 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2116 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2117 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work 2117 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
2118 if(found) 2118 if (found)
2119 { 2119 {
2120 DetectedObject detobj = new DetectedObject(); 2120 DetectedObject detobj = new DetectedObject();
2121 detobj.keyUUID = av.UUID; 2121 detobj.keyUUID = av.UUID;
@@ -2169,11 +2169,11 @@ namespace OpenSim.Region.Framework.Scenes
2169 string data = ""; 2169 string data = "";
2170 if (obj != null) 2170 if (obj != null)
2171 { 2171 {
2172 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 2172 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
2173 { 2173 {
2174 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2174 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2175 //If it is 1, it is to accept ONLY collisions from this object 2175 //If it is 1, it is to accept ONLY collisions from this object
2176 if(found) 2176 if (found)
2177 { 2177 {
2178 DetectedObject detobj = new DetectedObject(); 2178 DetectedObject detobj = new DetectedObject();
2179 detobj.keyUUID = obj.UUID; 2179 detobj.keyUUID = obj.UUID;
@@ -2195,7 +2195,7 @@ namespace OpenSim.Region.Framework.Scenes
2195 { 2195 {
2196 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2196 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2197 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work 2197 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
2198 if(found) 2198 if (found)
2199 { 2199 {
2200 DetectedObject detobj = new DetectedObject(); 2200 DetectedObject detobj = new DetectedObject();
2201 detobj.keyUUID = obj.UUID; 2201 detobj.keyUUID = obj.UUID;
@@ -2220,11 +2220,11 @@ namespace OpenSim.Region.Framework.Scenes
2220 2220
2221 if (av.LocalId == localId) 2221 if (av.LocalId == localId)
2222 { 2222 {
2223 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 2223 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
2224 { 2224 {
2225 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2225 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2226 //If it is 1, it is to accept ONLY collisions from this avatar 2226 //If it is 1, it is to accept ONLY collisions from this avatar
2227 if(found) 2227 if (found)
2228 { 2228 {
2229 DetectedObject detobj = new DetectedObject(); 2229 DetectedObject detobj = new DetectedObject();
2230 detobj.keyUUID = av.UUID; 2230 detobj.keyUUID = av.UUID;
@@ -2246,7 +2246,7 @@ namespace OpenSim.Region.Framework.Scenes
2246 { 2246 {
2247 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2247 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2248 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work 2248 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
2249 if(found) 2249 if (found)
2250 { 2250 {
2251 DetectedObject detobj = new DetectedObject(); 2251 DetectedObject detobj = new DetectedObject();
2252 detobj.keyUUID = av.UUID; 2252 detobj.keyUUID = av.UUID;
@@ -2888,6 +2888,13 @@ namespace OpenSim.Region.Framework.Scenes
2888 ScheduleFullUpdate(); 2888 ScheduleFullUpdate();
2889 } 2889 }
2890 2890
2891 public void StopLookAt()
2892 {
2893 m_parentGroup.stopLookAt();
2894
2895 m_parentGroup.ScheduleGroupForTerseUpdate();
2896 }
2897
2891 /// <summary> 2898 /// <summary>
2892 /// Set the text displayed for this part. 2899 /// Set the text displayed for this part.
2893 /// </summary> 2900 /// </summary>
generated by cgit v1.1 at 2024-11-12 17:50:09 +0000