aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/ILandChannel.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs45
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs22
6 files changed, 45 insertions, 38 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index 6fe6118..f71e31d 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Interfaces
60 /// </summary> 60 /// </summary>
61 /// <param name="position"></param> 61 /// <param name="position"></param>
62 /// <returns></returns> 62 /// <returns></returns>
63 List<ILandObject> ParcelsNearPoint(Vector3 position); 63 List<ILandObject> ParcelsNearPoint(Vector3 position);
64 64
65 /// <summary> 65 /// <summary>
66 /// Get the parcel given the land's local id. 66 /// Get the parcel given the land's local id.
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 1a8babc..991d60c 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Region.Framework.Interfaces
34 /// Interface to region archive functionality 34 /// Interface to region archive functionality
35 /// </summary> 35 /// </summary>
36 public interface IRegionArchiverModule 36 public interface IRegionArchiverModule
37 { 37 {
38 void HandleLoadOarConsoleCommand(string module, string[] cmdparams); 38 void HandleLoadOarConsoleCommand(string module, string[] cmdparams);
39 void HandleSaveOarConsoleCommand(string module, string[] cmdparams); 39 void HandleSaveOarConsoleCommand(string module, string[] cmdparams);
40 40
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2e34d1c..adf5f02 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -387,11 +387,11 @@ namespace OpenSim.Region.Framework.Scenes
387 { 387 {
388 get { return StatsReporter.getLastReportedSimFPS(); } 388 get { return StatsReporter.getLastReportedSimFPS(); }
389 } 389 }
390 390
391 public float[] SimulatorStats 391 public float[] SimulatorStats
392 { 392 {
393 get { return StatsReporter.getLastReportedSimStats(); } 393 get { return StatsReporter.getLastReportedSimStats(); }
394 } 394 }
395 395
396 public string DefaultScriptEngine 396 public string DefaultScriptEngine
397 { 397 {
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>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c3bc96a..f36c1a9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1985,7 +1985,7 @@ namespace OpenSim.Region.Framework.Scenes
1985 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f)) 1985 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
1986 { 1986 {
1987 SitRaycastFindEdge(collisionPoint, normal); 1987 SitRaycastFindEdge(collisionPoint, normal);
1988 m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal ); 1988 m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
1989 } 1989 }
1990 else 1990 else
1991 { 1991 {
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index e368c2a..fd23294 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
82 private int m_fps = 0; 82 private int m_fps = 0;
83 // saved last reported value so there is something available for llGetRegionFPS 83 // saved last reported value so there is something available for llGetRegionFPS
84 private float lastReportedSimFPS = 0; 84 private float lastReportedSimFPS = 0;
85 private float[] lastReportedSimStats = new float[21]; 85 private float[] lastReportedSimStats = new float[21];
86 private float m_pfps = 0; 86 private float m_pfps = 0;
87 private int m_agentUpdates = 0; 87 private int m_agentUpdates = 0;
88 88
@@ -263,11 +263,11 @@ namespace OpenSim.Region.Framework.Scenes
263 263
264 sb[20].StatID = (uint)Stats.ScriptLinesPerSecond; 264 sb[20].StatID = (uint)Stats.ScriptLinesPerSecond;
265 sb[20].StatValue = m_scriptLinesPerSecond / statsUpdateFactor; 265 sb[20].StatValue = m_scriptLinesPerSecond / statsUpdateFactor;
266 266
267 for (int i = 0; i < 21; i++) 267 for (int i = 0; i < 21; i++)
268 { 268 {
269 lastReportedSimStats[i] = sb[i].StatValue; 269 lastReportedSimStats[i] = sb[i].StatValue;
270 } 270 }
271 271
272 SimStats simStats 272 SimStats simStats
273 = new SimStats( 273 = new SimStats(
@@ -447,11 +447,11 @@ namespace OpenSim.Region.Framework.Scenes
447 { 447 {
448 return lastReportedSimFPS; 448 return lastReportedSimFPS;
449 } 449 }
450 450
451 public float[] getLastReportedSimStats() 451 public float[] getLastReportedSimStats()
452 { 452 {
453 return lastReportedSimStats; 453 return lastReportedSimStats;
454 } 454 }
455 455
456 public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes) 456 public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes)
457 { 457 {
generated by cgit v1.1 at 2024-12-21 07:00:27 +0000