aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2009-10-19 08:58:03 +0900
committerJeff Ames2009-10-19 08:58:03 +0900
commit0d29614ca129a044f6fad01f5600c52a922b702c (patch)
tree2bb8093bb168a0aa9deffc33af4b66f5ce2d31bf
parentAdd support for display of the script compilation errors in the script editor's (diff)
downloadopensim-SC_OLD-0d29614ca129a044f6fad01f5600c52a922b702c.zip
opensim-SC_OLD-0d29614ca129a044f6fad01f5600c52a922b702c.tar.gz
opensim-SC_OLD-0d29614ca129a044f6fad01f5600c52a922b702c.tar.bz2
opensim-SC_OLD-0d29614ca129a044f6fad01f5600c52a922b702c.tar.xz
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs6
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserAccountData.cs6
-rw-r--r--OpenSim/Framework/BlockingQueue.cs6
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs2
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Physics/Manager/IMesher.cs2
-rw-r--r--OpenSim/Region/Physics/Meshing/Mesh.cs6
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs4
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestLandChannel.cs24
13 files changed, 36 insertions, 36 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
index 9a17e47..801610a 100644
--- a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Data.MSSQL
119 updateBuilder.AppendFormat("{0} = @{0}",field); 119 updateBuilder.AppendFormat("{0} = @{0}",field);
120 120
121 first = false; 121 first = false;
122 cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field])); 122 cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
123 } 123 }
124 124
125 updateBuilder.Append(" where UUID = @principalID"); 125 updateBuilder.Append(" where UUID = @principalID");
@@ -135,7 +135,7 @@ namespace OpenSim.Data.MSSQL
135 135
136 insertBuilder.AppendFormat("insert into {0} (UUID, ", m_Realm); 136 insertBuilder.AppendFormat("insert into {0} (UUID, ", m_Realm);
137 insertBuilder.Append(String.Join(", ", fields)); 137 insertBuilder.Append(String.Join(", ", fields));
138 insertBuilder.Append(") values ( @principalID, @"); 138 insertBuilder.Append(") values (@principalID, @");
139 insertBuilder.Append(String.Join(", @", fields)); 139 insertBuilder.Append(String.Join(", @", fields));
140 insertBuilder.Append(")"); 140 insertBuilder.Append(")");
141 141
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
index e2ae5cb..cff6b00 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Data.MSSQL
146 sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID); 146 sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID);
147 147
148 sceneObjectPart.UUID = groupID; 148 sceneObjectPart.UUID = groupID;
149 } 149 }
150 150
151 grp = new SceneObjectGroup(sceneObjectPart); 151 grp = new SceneObjectGroup(sceneObjectPart);
152 } 152 }
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 78d7fd0..a898aab 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Data.MSSQL
62 conn.Open(); 62 conn.Open();
63 Migration m = new Migration(conn, GetType().Assembly, "GridStore"); 63 Migration m = new Migration(conn, GetType().Assembly, "GridStore");
64 m.Update(); 64 m.Update();
65 } 65 }
66 } 66 }
67 67
68 public List<RegionData> Get(string regionName, UUID scopeID) 68 public List<RegionData> Get(string regionName, UUID scopeID)
@@ -98,7 +98,7 @@ namespace OpenSim.Data.MSSQL
98 return null; 98 return null;
99 99
100 return ret[0]; 100 return ret[0];
101 } 101 }
102 } 102 }
103 103
104 public RegionData Get(UUID regionID, UUID scopeID) 104 public RegionData Get(UUID regionID, UUID scopeID)
@@ -251,7 +251,7 @@ namespace OpenSim.Data.MSSQL
251 { 251 {
252 string insert = "insert into [" + m_Realm + "] ([uuid], [ScopeID], [locX], [locY], [sizeX], [sizeY], [regionName], [" + 252 string insert = "insert into [" + m_Realm + "] ([uuid], [ScopeID], [locX], [locY], [sizeX], [sizeY], [regionName], [" +
253 String.Join("], [", fields) + 253 String.Join("], [", fields) +
254 "]) values ( @regionID, @scopeID, @posX, @posY, @sizeX, @sizeY, @regionName, @" + String.Join(", @", fields) + ")"; 254 "]) values (@regionID, @scopeID, @posX, @posY, @sizeX, @sizeY, @regionName, @" + String.Join(", @", fields) + ")";
255 255
256 cmd.CommandText = insert; 256 cmd.CommandText = insert;
257 257
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index 7b6e7c8..2d92cb1 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Data.MSSQL
54 conn.Open(); 54 conn.Open();
55 Migration m = new Migration(conn, GetType().Assembly, "UserStore"); 55 Migration m = new Migration(conn, GetType().Assembly, "UserStore");
56 m.Update(); 56 m.Update();
57 } 57 }
58 } 58 }
59 59
60 public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query) 60 public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query)
@@ -134,7 +134,7 @@ namespace OpenSim.Data.MSSQL
134 updateBuilder.AppendFormat("{0} = @{0}", field); 134 updateBuilder.AppendFormat("{0} = @{0}", field);
135 135
136 first = false; 136 first = false;
137 cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field])); 137 cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
138 } 138 }
139 139
140 updateBuilder.Append(" where UUID = @principalID"); 140 updateBuilder.Append(" where UUID = @principalID");
@@ -153,7 +153,7 @@ namespace OpenSim.Data.MSSQL
153 StringBuilder insertBuilder = new StringBuilder(); 153 StringBuilder insertBuilder = new StringBuilder();
154 insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm); 154 insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm);
155 insertBuilder.Append(String.Join(", ", fields)); 155 insertBuilder.Append(String.Join(", ", fields));
156 insertBuilder.Append(") values ( @principalID, @scopeID, @"); 156 insertBuilder.Append(") values (@principalID, @scopeID, @");
157 insertBuilder.Append(String.Join(", @", fields)); 157 insertBuilder.Append(String.Join(", @", fields));
158 insertBuilder.Append(")"); 158 insertBuilder.Append(")");
159 159
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 857930a..3658161 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -67,8 +67,8 @@ namespace OpenSim.Framework
67 return m_pqueue.Dequeue(); 67 return m_pqueue.Dequeue();
68 68
69 if (m_queue.Count > 0) 69 if (m_queue.Count > 0)
70 return m_queue.Dequeue(); 70 return m_queue.Dequeue();
71 return default(T); 71 return default(T);
72 } 72 }
73 } 73 }
74 74
@@ -121,7 +121,7 @@ namespace OpenSim.Framework
121 { 121 {
122 m_pqueue.Clear(); 122 m_pqueue.Clear();
123 m_queue.Clear(); 123 m_queue.Clear();
124 Monitor.Pulse(m_queueSync); 124 Monitor.Pulse(m_queueSync);
125 } 125 }
126 } 126 }
127 } 127 }
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 845a9fe..0d93ff7 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -246,7 +246,7 @@ namespace OpenSim.Framework.Servers
246 foreach (ProcessThread t in threads) 246 foreach (ProcessThread t in threads)
247 { 247 {
248 sb.Append("ID: " + t.Id + ", TotalProcessorTime: " + t.TotalProcessorTime + ", TimeRunning: " + 248 sb.Append("ID: " + t.Id + ", TotalProcessorTime: " + t.TotalProcessorTime + ", TimeRunning: " +
249 (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState ); 249 (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState);
250 if (t.ThreadState == System.Diagnostics.ThreadState.Wait) 250 if (t.ThreadState == System.Diagnostics.ThreadState.Wait)
251 sb.Append(", Reason: " + t.WaitReason + Environment.NewLine); 251 sb.Append(", Reason: " + t.WaitReason + Environment.NewLine);
252 else 252 else
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 4041b63..5ca4178 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -730,7 +730,7 @@ namespace Flotsam.RegionModules.AssetCache
730 int fileCount = GetFileCacheCount(m_CacheDirectory); 730 int fileCount = GetFileCacheCount(m_CacheDirectory);
731 m_log.InfoFormat("[FLOTSAM ASSET CACHE] File Cache : {0} assets", fileCount); 731 m_log.InfoFormat("[FLOTSAM ASSET CACHE] File Cache : {0} assets", fileCount);
732 732
733 foreach ( string s in Directory.GetFiles(m_CacheDirectory, "*.fac" ) ) 733 foreach (string s in Directory.GetFiles(m_CacheDirectory, "*.fac"))
734 { 734 {
735 m_log.Info("[FLOTSAM ASSET CACHE] Deep Scans were performed on the following regions:"); 735 m_log.Info("[FLOTSAM ASSET CACHE] Deep Scans were performed on the following regions:");
736 736
@@ -770,7 +770,7 @@ namespace Flotsam.RegionModules.AssetCache
770 int assetsCached = CacheScenes(); 770 int assetsCached = CacheScenes();
771 m_log.InfoFormat("[FLOTSAM ASSET CACHE] Completed Scene Caching, {0} assets found.", assetsCached); 771 m_log.InfoFormat("[FLOTSAM ASSET CACHE] Completed Scene Caching, {0} assets found.", assetsCached);
772 772
773 }); 773 });
774 774
775 break; 775 break;
776 776
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 29d2a84..151df27 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1116,13 +1116,13 @@ namespace OpenSim.Region.Framework.Scenes
1116 1116
1117 public void AddGroupTarget(SceneObjectGroup grp) 1117 public void AddGroupTarget(SceneObjectGroup grp)
1118 { 1118 {
1119 lock(m_groupsWithTargets) 1119 lock (m_groupsWithTargets)
1120 m_groupsWithTargets[grp.UUID] = grp; 1120 m_groupsWithTargets[grp.UUID] = grp;
1121 } 1121 }
1122 1122
1123 public void RemoveGroupTarget(SceneObjectGroup grp) 1123 public void RemoveGroupTarget(SceneObjectGroup grp)
1124 { 1124 {
1125 lock(m_groupsWithTargets) 1125 lock (m_groupsWithTargets)
1126 m_groupsWithTargets.Remove(grp.UUID); 1126 m_groupsWithTargets.Remove(grp.UUID);
1127 } 1127 }
1128 1128
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs
index ac14292..1a8c948 100644
--- a/OpenSim/Region/Physics/Manager/IMesher.cs
+++ b/OpenSim/Region/Physics/Manager/IMesher.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Physics.Manager
48 int[] getIndexListAsIntLocked(); 48 int[] getIndexListAsIntLocked();
49 float[] getVertexListAsFloatLocked(); 49 float[] getVertexListAsFloatLocked();
50 void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); 50 void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount);
51 void getVertexListAsPtrToFloatArray( out IntPtr vertexList, out int vertexStride, out int vertexCount ); 51 void getVertexListAsPtrToFloatArray(out IntPtr vertexList, out int vertexStride, out int vertexCount);
52 void releaseSourceMeshData(); 52 void releaseSourceMeshData();
53 void releasePinned(); 53 void releasePinned();
54 void Append(IMesh newMesh); 54 void Append(IMesh newMesh);
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs
index 94d926a..4c3cf33 100644
--- a/OpenSim/Region/Physics/Meshing/Mesh.cs
+++ b/OpenSim/Region/Physics/Meshing/Mesh.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Physics.Meshing
70 throw new NotSupportedException("Attempt to Add to a pinned Mesh"); 70 throw new NotSupportedException("Attempt to Add to a pinned Mesh");
71 // If a vertex of the triangle is not yet in the vertices list, 71 // If a vertex of the triangle is not yet in the vertices list,
72 // add it and set its index to the current index count 72 // add it and set its index to the current index count
73 if( !m_vertices.ContainsKey(triangle.v1) ) 73 if (!m_vertices.ContainsKey(triangle.v1))
74 m_vertices[triangle.v1] = m_vertices.Count; 74 m_vertices[triangle.v1] = m_vertices.Count;
75 if (!m_vertices.ContainsKey(triangle.v2)) 75 if (!m_vertices.ContainsKey(triangle.v2))
76 m_vertices[triangle.v2] = m_vertices.Count; 76 m_vertices[triangle.v2] = m_vertices.Count;
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Physics.Meshing
153 153
154 private float[] getVertexListAsFloat() 154 private float[] getVertexListAsFloat()
155 { 155 {
156 if(m_vertices == null) 156 if (m_vertices == null)
157 throw new NotSupportedException(); 157 throw new NotSupportedException();
158 float[] result = new float[m_vertices.Count * 3]; 158 float[] result = new float[m_vertices.Count * 3];
159 foreach (KeyValuePair<Vertex, int> kvp in m_vertices) 159 foreach (KeyValuePair<Vertex, int> kvp in m_vertices)
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Physics.Meshing
169 169
170 public float[] getVertexListAsFloatLocked() 170 public float[] getVertexListAsFloatLocked()
171 { 171 {
172 if( m_pinnedVertexes.IsAllocated ) 172 if (m_pinnedVertexes.IsAllocated)
173 return (float[])(m_pinnedVertexes.Target); 173 return (float[])(m_pinnedVertexes.Target);
174 174
175 float[] result = getVertexListAsFloat(); 175 float[] result = getVertexListAsFloat();
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 496e097..63bfc90 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -816,8 +816,8 @@ namespace OpenSim.Region.Physics.OdePlugin
816 IntPtr vertices, indices; 816 IntPtr vertices, indices;
817 int vertexCount, indexCount; 817 int vertexCount, indexCount;
818 int vertexStride, triStride; 818 int vertexStride, triStride;
819 mesh.getVertexListAsPtrToFloatArray( out vertices, out vertexStride, out vertexCount ); // Note, that vertices are fixed in unmanaged heap 819 mesh.getVertexListAsPtrToFloatArray(out vertices, out vertexStride, out vertexCount); // Note, that vertices are fixed in unmanaged heap
820 mesh.getIndexListAsPtrToIntArray( out indices, out triStride, out indexCount ); // Also fixed, needs release after usage 820 mesh.getIndexListAsPtrToIntArray(out indices, out triStride, out indexCount); // Also fixed, needs release after usage
821 821
822 mesh.releaseSourceMeshData(); // free up the original mesh data to save memory 822 mesh.releaseSourceMeshData(); // free up the original mesh data to save memory
823 823
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 0e03e81..92afe39 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -3799,7 +3799,7 @@ namespace OpenSim.Region.Physics.OdePlugin
3799 } 3799 }
3800 3800
3801 public void start(int unused) 3801 public void start(int unused)
3802 { 3802 {
3803 ds.SetViewpoint(ref xyz, ref hpr); 3803 ds.SetViewpoint(ref xyz, ref hpr);
3804 } 3804 }
3805#endif 3805#endif
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index ed30827..be28c27 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -46,14 +46,14 @@ namespace OpenSim.Tests.Common.Mock
46 m_scene = scene; 46 m_scene = scene;
47 } 47 }
48 48
49 public List<ILandObject> ParcelsNearPoint(Vector3 position) 49 public List<ILandObject> ParcelsNearPoint(Vector3 position)
50 { 50 {
51 return new List<ILandObject>(); 51 return new List<ILandObject>();
52 } 52 }
53 53
54 public List<ILandObject> AllParcels() 54 public List<ILandObject> AllParcels()
55 { 55 {
56 return new List<ILandObject>(); 56 return new List<ILandObject>();
57 } 57 }
58 58
59 protected ILandObject GetNoLand() 59 protected ILandObject GetNoLand()
@@ -63,18 +63,18 @@ namespace OpenSim.Tests.Common.Mock
63 return obj; 63 return obj;
64 } 64 }
65 65
66 public ILandObject GetLandObject(int x, int y) 66 public ILandObject GetLandObject(int x, int y)
67 { 67 {
68 return GetNoLand(); 68 return GetNoLand();
69 } 69 }
70 70
71 public ILandObject GetLandObject(int localID) 71 public ILandObject GetLandObject(int localID)
72 { 72 {
73 return GetNoLand(); 73 return GetNoLand();
74 } 74 }
75 75
76 public ILandObject GetLandObject(float x, float y) 76 public ILandObject GetLandObject(float x, float y)
77 { 77 {
78 return GetNoLand(); 78 return GetNoLand();
79 } 79 }
80 80