From 0d29614ca129a044f6fad01f5600c52a922b702c Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 19 Oct 2009 08:58:03 +0900 Subject: Formatting cleanup. --- OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs | 4 ++-- OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs | 2 +- OpenSim/Data/MSSQL/MSSQLRegionData.cs | 6 +++--- OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | 6 +++--- OpenSim/Framework/BlockingQueue.cs | 6 +++--- OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 +- .../Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 ++-- OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++-- OpenSim/Region/Physics/Manager/IMesher.cs | 2 +- OpenSim/Region/Physics/Meshing/Mesh.cs | 6 +++--- OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 ++-- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 +- OpenSim/Tests/Common/Mock/TestLandChannel.cs | 24 +++++++++++----------- 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 updateBuilder.AppendFormat("{0} = @{0}",field); first = false; - cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field])); + cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field])); } updateBuilder.Append(" where UUID = @principalID"); @@ -135,7 +135,7 @@ namespace OpenSim.Data.MSSQL insertBuilder.AppendFormat("insert into {0} (UUID, ", m_Realm); insertBuilder.Append(String.Join(", ", fields)); - insertBuilder.Append(") values ( @principalID, @"); + insertBuilder.Append(") values (@principalID, @"); insertBuilder.Append(String.Join(", @", fields)); insertBuilder.Append(")"); 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 sceneObjectPart.Name, sceneObjectPart.UUID, sceneObjectPart.GroupPosition, groupID); sceneObjectPart.UUID = groupID; - } + } grp = new SceneObjectGroup(sceneObjectPart); } 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 conn.Open(); Migration m = new Migration(conn, GetType().Assembly, "GridStore"); m.Update(); - } + } } public List Get(string regionName, UUID scopeID) @@ -98,7 +98,7 @@ namespace OpenSim.Data.MSSQL return null; return ret[0]; - } + } } public RegionData Get(UUID regionID, UUID scopeID) @@ -251,7 +251,7 @@ namespace OpenSim.Data.MSSQL { string insert = "insert into [" + m_Realm + "] ([uuid], [ScopeID], [locX], [locY], [sizeX], [sizeY], [regionName], [" + String.Join("], [", fields) + - "]) values ( @regionID, @scopeID, @posX, @posY, @sizeX, @sizeY, @regionName, @" + String.Join(", @", fields) + ")"; + "]) values (@regionID, @scopeID, @posX, @posY, @sizeX, @sizeY, @regionName, @" + String.Join(", @", fields) + ")"; cmd.CommandText = insert; 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 conn.Open(); Migration m = new Migration(conn, GetType().Assembly, "UserStore"); m.Update(); - } + } } public List Query(UUID principalID, UUID scopeID, string query) @@ -134,7 +134,7 @@ namespace OpenSim.Data.MSSQL updateBuilder.AppendFormat("{0} = @{0}", field); first = false; - cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field])); + cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field])); } updateBuilder.Append(" where UUID = @principalID"); @@ -153,7 +153,7 @@ namespace OpenSim.Data.MSSQL StringBuilder insertBuilder = new StringBuilder(); insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm); insertBuilder.Append(String.Join(", ", fields)); - insertBuilder.Append(") values ( @principalID, @scopeID, @"); + insertBuilder.Append(") values (@principalID, @scopeID, @"); insertBuilder.Append(String.Join(", @", fields)); insertBuilder.Append(")"); 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 return m_pqueue.Dequeue(); if (m_queue.Count > 0) - return m_queue.Dequeue(); - return default(T); + return m_queue.Dequeue(); + return default(T); } } @@ -121,7 +121,7 @@ namespace OpenSim.Framework { m_pqueue.Clear(); m_queue.Clear(); - Monitor.Pulse(m_queueSync); + Monitor.Pulse(m_queueSync); } } } 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 foreach (ProcessThread t in threads) { sb.Append("ID: " + t.Id + ", TotalProcessorTime: " + t.TotalProcessorTime + ", TimeRunning: " + - (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState ); + (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState); if (t.ThreadState == System.Diagnostics.ThreadState.Wait) sb.Append(", Reason: " + t.WaitReason + Environment.NewLine); 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 int fileCount = GetFileCacheCount(m_CacheDirectory); m_log.InfoFormat("[FLOTSAM ASSET CACHE] File Cache : {0} assets", fileCount); - foreach ( string s in Directory.GetFiles(m_CacheDirectory, "*.fac" ) ) + foreach (string s in Directory.GetFiles(m_CacheDirectory, "*.fac")) { m_log.Info("[FLOTSAM ASSET CACHE] Deep Scans were performed on the following regions:"); @@ -770,7 +770,7 @@ namespace Flotsam.RegionModules.AssetCache int assetsCached = CacheScenes(); m_log.InfoFormat("[FLOTSAM ASSET CACHE] Completed Scene Caching, {0} assets found.", assetsCached); - }); + }); break; 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 public void AddGroupTarget(SceneObjectGroup grp) { - lock(m_groupsWithTargets) + lock (m_groupsWithTargets) m_groupsWithTargets[grp.UUID] = grp; } public void RemoveGroupTarget(SceneObjectGroup grp) { - lock(m_groupsWithTargets) + lock (m_groupsWithTargets) m_groupsWithTargets.Remove(grp.UUID); } 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 int[] getIndexListAsIntLocked(); float[] getVertexListAsFloatLocked(); void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); - void getVertexListAsPtrToFloatArray( out IntPtr vertexList, out int vertexStride, out int vertexCount ); + void getVertexListAsPtrToFloatArray(out IntPtr vertexList, out int vertexStride, out int vertexCount); void releaseSourceMeshData(); void releasePinned(); 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 throw new NotSupportedException("Attempt to Add to a pinned Mesh"); // If a vertex of the triangle is not yet in the vertices list, // add it and set its index to the current index count - if( !m_vertices.ContainsKey(triangle.v1) ) + if (!m_vertices.ContainsKey(triangle.v1)) m_vertices[triangle.v1] = m_vertices.Count; if (!m_vertices.ContainsKey(triangle.v2)) m_vertices[triangle.v2] = m_vertices.Count; @@ -153,7 +153,7 @@ namespace OpenSim.Region.Physics.Meshing private float[] getVertexListAsFloat() { - if(m_vertices == null) + if (m_vertices == null) throw new NotSupportedException(); float[] result = new float[m_vertices.Count * 3]; foreach (KeyValuePair kvp in m_vertices) @@ -169,7 +169,7 @@ namespace OpenSim.Region.Physics.Meshing public float[] getVertexListAsFloatLocked() { - if( m_pinnedVertexes.IsAllocated ) + if (m_pinnedVertexes.IsAllocated) return (float[])(m_pinnedVertexes.Target); 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 IntPtr vertices, indices; int vertexCount, indexCount; int vertexStride, triStride; - mesh.getVertexListAsPtrToFloatArray( out vertices, out vertexStride, out vertexCount ); // Note, that vertices are fixed in unmanaged heap - mesh.getIndexListAsPtrToIntArray( out indices, out triStride, out indexCount ); // Also fixed, needs release after usage + mesh.getVertexListAsPtrToFloatArray(out vertices, out vertexStride, out vertexCount); // Note, that vertices are fixed in unmanaged heap + mesh.getIndexListAsPtrToIntArray(out indices, out triStride, out indexCount); // Also fixed, needs release after usage mesh.releaseSourceMeshData(); // free up the original mesh data to save memory 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 } public void start(int unused) - { + { ds.SetViewpoint(ref xyz, ref hpr); } #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 m_scene = scene; } - public List ParcelsNearPoint(Vector3 position) - { - return new List(); + public List ParcelsNearPoint(Vector3 position) + { + return new List(); } - public List AllParcels() - { - return new List(); + public List AllParcels() + { + return new List(); } protected ILandObject GetNoLand() @@ -63,18 +63,18 @@ namespace OpenSim.Tests.Common.Mock return obj; } - public ILandObject GetLandObject(int x, int y) - { + public ILandObject GetLandObject(int x, int y) + { return GetNoLand(); } - public ILandObject GetLandObject(int localID) - { + public ILandObject GetLandObject(int localID) + { return GetNoLand(); } - public ILandObject GetLandObject(float x, float y) - { + public ILandObject GetLandObject(float x, float y) + { return GetNoLand(); } -- cgit v1.1