diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/IMesher.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Mesh.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 |
6 files changed, 11 insertions, 11 deletions
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 |