aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJeff Ames2010-01-04 06:10:45 +0900
committerJeff Ames2010-01-04 06:17:30 +0900
commit70d5b1c34cf2eb6621f383169fdee03966850762 (patch)
tree18bf786a4c0897cb24fa9ceef5f53d5ce345a78f /OpenSim/Region/Framework
parentAdd virtual method StateChange to ScriptBaseClass (diff)
downloadopensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.zip
opensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.tar.gz
opensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.tar.bz2
opensim-SC_OLD-70d5b1c34cf2eb6621f383169fdee03966850762.tar.xz
Formatting cleanup. Add copyright headers.
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.cs42
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs22
6 files changed, 40 insertions, 40 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 0e1e2be..764ac60 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 b50def3..22a8ca1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1893,11 +1893,11 @@ namespace OpenSim.Region.Framework.Scenes
1893 string data = ""; 1893 string data = "";
1894 if (obj != null) 1894 if (obj != null)
1895 { 1895 {
1896 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 1896 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
1897 { 1897 {
1898 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1898 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1899 //If it is 1, it is to accept ONLY collisions from this object 1899 //If it is 1, it is to accept ONLY collisions from this object
1900 if(found) 1900 if (found)
1901 { 1901 {
1902 DetectedObject detobj = new DetectedObject(); 1902 DetectedObject detobj = new DetectedObject();
1903 detobj.keyUUID = obj.UUID; 1903 detobj.keyUUID = obj.UUID;
@@ -1919,7 +1919,7 @@ namespace OpenSim.Region.Framework.Scenes
1919 { 1919 {
1920 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1920 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1921 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work 1921 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
1922 if(found) 1922 if (found)
1923 { 1923 {
1924 DetectedObject detobj = new DetectedObject(); 1924 DetectedObject detobj = new DetectedObject();
1925 detobj.keyUUID = obj.UUID; 1925 detobj.keyUUID = obj.UUID;
@@ -1944,11 +1944,11 @@ namespace OpenSim.Region.Framework.Scenes
1944 1944
1945 if (av.LocalId == localId) 1945 if (av.LocalId == localId)
1946 { 1946 {
1947 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 1947 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
1948 { 1948 {
1949 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1949 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1950 //If it is 1, it is to accept ONLY collisions from this avatar 1950 //If it is 1, it is to accept ONLY collisions from this avatar
1951 if(found) 1951 if (found)
1952 { 1952 {
1953 DetectedObject detobj = new DetectedObject(); 1953 DetectedObject detobj = new DetectedObject();
1954 detobj.keyUUID = av.UUID; 1954 detobj.keyUUID = av.UUID;
@@ -1970,7 +1970,7 @@ namespace OpenSim.Region.Framework.Scenes
1970 { 1970 {
1971 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 1971 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
1972 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work 1972 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
1973 if(found) 1973 if (found)
1974 { 1974 {
1975 DetectedObject detobj = new DetectedObject(); 1975 DetectedObject detobj = new DetectedObject();
1976 detobj.keyUUID = av.UUID; 1976 detobj.keyUUID = av.UUID;
@@ -1998,7 +1998,7 @@ namespace OpenSim.Region.Framework.Scenes
1998 1998
1999 if (m_parentGroup.Scene == null) 1999 if (m_parentGroup.Scene == null)
2000 return; 2000 return;
2001 if(m_parentGroup.PassCollision == true) 2001 if (m_parentGroup.PassCollision == true)
2002 { 2002 {
2003 //TODO: Add pass to root prim! 2003 //TODO: Add pass to root prim!
2004 } 2004 }
@@ -2029,11 +2029,11 @@ namespace OpenSim.Region.Framework.Scenes
2029 string data = ""; 2029 string data = "";
2030 if (obj != null) 2030 if (obj != null)
2031 { 2031 {
2032 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 2032 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
2033 { 2033 {
2034 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2034 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2035 //If it is 1, it is to accept ONLY collisions from this object 2035 //If it is 1, it is to accept ONLY collisions from this object
2036 if(found) 2036 if (found)
2037 { 2037 {
2038 DetectedObject detobj = new DetectedObject(); 2038 DetectedObject detobj = new DetectedObject();
2039 detobj.keyUUID = obj.UUID; 2039 detobj.keyUUID = obj.UUID;
@@ -2055,7 +2055,7 @@ namespace OpenSim.Region.Framework.Scenes
2055 { 2055 {
2056 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2056 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2057 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work 2057 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
2058 if(found) 2058 if (found)
2059 { 2059 {
2060 DetectedObject detobj = new DetectedObject(); 2060 DetectedObject detobj = new DetectedObject();
2061 detobj.keyUUID = obj.UUID; 2061 detobj.keyUUID = obj.UUID;
@@ -2080,11 +2080,11 @@ namespace OpenSim.Region.Framework.Scenes
2080 2080
2081 if (av.LocalId == localId) 2081 if (av.LocalId == localId)
2082 { 2082 {
2083 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 2083 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
2084 { 2084 {
2085 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2085 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2086 //If it is 1, it is to accept ONLY collisions from this avatar 2086 //If it is 1, it is to accept ONLY collisions from this avatar
2087 if(found) 2087 if (found)
2088 { 2088 {
2089 DetectedObject detobj = new DetectedObject(); 2089 DetectedObject detobj = new DetectedObject();
2090 detobj.keyUUID = av.UUID; 2090 detobj.keyUUID = av.UUID;
@@ -2106,7 +2106,7 @@ namespace OpenSim.Region.Framework.Scenes
2106 { 2106 {
2107 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2107 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2108 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work 2108 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
2109 if(found) 2109 if (found)
2110 { 2110 {
2111 DetectedObject detobj = new DetectedObject(); 2111 DetectedObject detobj = new DetectedObject();
2112 detobj.keyUUID = av.UUID; 2112 detobj.keyUUID = av.UUID;
@@ -2160,11 +2160,11 @@ namespace OpenSim.Region.Framework.Scenes
2160 string data = ""; 2160 string data = "";
2161 if (obj != null) 2161 if (obj != null)
2162 { 2162 {
2163 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 2163 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
2164 { 2164 {
2165 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2165 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2166 //If it is 1, it is to accept ONLY collisions from this object 2166 //If it is 1, it is to accept ONLY collisions from this object
2167 if(found) 2167 if (found)
2168 { 2168 {
2169 DetectedObject detobj = new DetectedObject(); 2169 DetectedObject detobj = new DetectedObject();
2170 detobj.keyUUID = obj.UUID; 2170 detobj.keyUUID = obj.UUID;
@@ -2186,7 +2186,7 @@ namespace OpenSim.Region.Framework.Scenes
2186 { 2186 {
2187 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2187 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2188 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work 2188 //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
2189 if(found) 2189 if (found)
2190 { 2190 {
2191 DetectedObject detobj = new DetectedObject(); 2191 DetectedObject detobj = new DetectedObject();
2192 detobj.keyUUID = obj.UUID; 2192 detobj.keyUUID = obj.UUID;
@@ -2211,11 +2211,11 @@ namespace OpenSim.Region.Framework.Scenes
2211 2211
2212 if (av.LocalId == localId) 2212 if (av.LocalId == localId)
2213 { 2213 {
2214 if(m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name)) 2214 if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
2215 { 2215 {
2216 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2216 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2217 //If it is 1, it is to accept ONLY collisions from this avatar 2217 //If it is 1, it is to accept ONLY collisions from this avatar
2218 if(found) 2218 if (found)
2219 { 2219 {
2220 DetectedObject detobj = new DetectedObject(); 2220 DetectedObject detobj = new DetectedObject();
2221 detobj.keyUUID = av.UUID; 2221 detobj.keyUUID = av.UUID;
@@ -2237,7 +2237,7 @@ namespace OpenSim.Region.Framework.Scenes
2237 { 2237 {
2238 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data); 2238 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
2239 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work 2239 //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
2240 if(found) 2240 if (found)
2241 { 2241 {
2242 DetectedObject detobj = new DetectedObject(); 2242 DetectedObject detobj = new DetectedObject();
2243 detobj.keyUUID = av.UUID; 2243 detobj.keyUUID = av.UUID;
@@ -2881,8 +2881,8 @@ namespace OpenSim.Region.Framework.Scenes
2881 { 2881 {
2882 m_parentGroup.stopLookAt(); 2882 m_parentGroup.stopLookAt();
2883 2883
2884 m_parentGroup.ScheduleGroupForTerseUpdate(); 2884 m_parentGroup.ScheduleGroupForTerseUpdate();
2885 } 2885 }
2886 2886
2887 /// <summary> 2887 /// <summary>
2888 /// Set the text displayed for this part. 2888 /// Set the text displayed for this part.
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 277081a..8545425 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1851,7 +1851,7 @@ namespace OpenSim.Region.Framework.Scenes
1851 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f)) 1851 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
1852 { 1852 {
1853 SitRaycastFindEdge(collisionPoint, normal); 1853 SitRaycastFindEdge(collisionPoint, normal);
1854 m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal ); 1854 m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
1855 } 1855 }
1856 else 1856 else
1857 { 1857 {
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 {