ubMeshmerizer: add a few more try{} guards in file operations, etc

1 files changed, 23 insertions, 24 deletions

diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
index 5b1510f..d9ea4a4 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
@@ -588,38 +588,37 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
             Mesh mesh = new Mesh();
             mesh.releaseBuildingMeshData();
 
-            BinaryReader br = new BinaryReader(st);
-
             bool ok = true;
-            try
+            using(BinaryReader br = new BinaryReader(st))
             {
-                mesh.m_vertexCount = br.ReadInt32();
-                mesh.m_indexCount = br.ReadInt32();
+                try
+                {
+                    mesh.m_vertexCount = br.ReadInt32();
+                    mesh.m_indexCount = br.ReadInt32();
 
-                int n = 3 * mesh.m_vertexCount;
-                mesh.vertices = new float[n];
-                for (int i = 0; i < n; i++)
-                    mesh.vertices[i] = br.ReadSingle();
+                    int n = 3 * mesh.m_vertexCount;
+                    mesh.vertices = new float[n];
+                    for (int i = 0; i < n; i++)
+                        mesh.vertices[i] = br.ReadSingle();
 
-                mesh.indexes = new int[mesh.m_indexCount];
-                for (int i = 0; i < mesh.m_indexCount; i++)
-                    mesh.indexes[i] = br.ReadInt32();
+                    mesh.indexes = new int[mesh.m_indexCount];
+                    for (int i = 0; i < mesh.m_indexCount; i++)
+                        mesh.indexes[i] = br.ReadInt32();
 
-                mesh.m_obb.X = br.ReadSingle();
-                mesh.m_obb.Y = br.ReadSingle();
-                mesh.m_obb.Z = br.ReadSingle();
+                    mesh.m_obb.X = br.ReadSingle();
+                    mesh.m_obb.Y = br.ReadSingle();
+                    mesh.m_obb.Z = br.ReadSingle();
 
-                mesh.m_obboffset.X = br.ReadSingle();
-                mesh.m_obboffset.Y = br.ReadSingle();
-                mesh.m_obboffset.Z = br.ReadSingle();
-            }
-            catch
-            {
-                ok = false;
+                    mesh.m_obboffset.X = br.ReadSingle();
+                    mesh.m_obboffset.Y = br.ReadSingle();
+                    mesh.m_obboffset.Z = br.ReadSingle();
+                }
+                catch
+                {
+                    ok = false;
+                }
             }
 
-            br.Close();
-
             if (ok)
             {
                 mesh.pinMemory();