aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDahlia Trimble2008-08-27 07:30:14 +0000
committerDahlia Trimble2008-08-27 07:30:14 +0000
commitcf951d4d04129de7b42ff6df64af2bcc4f7656da (patch)
treecd803c037e9f08988b4a335b0abe9a4ca4599ac7
parentMeshmerizer now uses new PrimMesher class for meshing all standard (non-sculp... (diff)
downloadopensim-SC-cf951d4d04129de7b42ff6df64af2bcc4f7656da.zip
opensim-SC-cf951d4d04129de7b42ff6df64af2bcc4f7656da.tar.gz
opensim-SC-cf951d4d04129de7b42ff6df64af2bcc4f7656da.tar.bz2
opensim-SC-cf951d4d04129de7b42ff6df64af2bcc4f7656da.tar.xz
Added some exception handling to help catch some possibly corrupt prims
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs24
1 files changed, 22 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 06df4ca..4b2fb16 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -1926,7 +1926,17 @@ namespace OpenSim.Region.Physics.Meshing
1926#if SPAM 1926#if SPAM
1927 Console.WriteLine("****** PrimMesh Parameters (Linear) ******\n" + primMesh.ParamsToDisplayString()); 1927 Console.WriteLine("****** PrimMesh Parameters (Linear) ******\n" + primMesh.ParamsToDisplayString());
1928#endif 1928#endif
1929 primMesh.ExtrudeLinear(); 1929 try
1930 {
1931 primMesh.ExtrudeLinear();
1932 }
1933 catch (Exception ex)
1934 {
1935 Console.WriteLine("Extrusion failure: exception: " + ex.ToString());
1936 Console.WriteLine("\n Prim Name: " + primName);
1937 Console.WriteLine("****** PrimMesh Parameters (Linear) ******\n" + primMesh.ParamsToDisplayString());
1938 return null;
1939 }
1930 } 1940 }
1931 else 1941 else
1932 { 1942 {
@@ -1943,7 +1953,17 @@ namespace OpenSim.Region.Physics.Meshing
1943#if SPAM 1953#if SPAM
1944 Console.WriteLine("****** PrimMesh Parameters (Circular) ******\n" + primMesh.ParamsToDisplayString()); 1954 Console.WriteLine("****** PrimMesh Parameters (Circular) ******\n" + primMesh.ParamsToDisplayString());
1945#endif 1955#endif
1946 primMesh.ExtrudeCircular(); 1956 try
1957 {
1958 primMesh.ExtrudeCircular();
1959 }
1960 catch (Exception ex)
1961 {
1962 Console.WriteLine("Extrusion failure: exception: " + ex.ToString());
1963 Console.WriteLine("\n Prim Name: " + primName);
1964 Console.WriteLine("****** PrimMesh Parameters (Circular) ******\n" + primMesh.ParamsToDisplayString());
1965 return null;
1966 }
1947 } 1967 }
1948 1968
1949 primMesh.DumpRaw(baseDir, primName, "primMesh"); 1969 primMesh.DumpRaw(baseDir, primName, "primMesh");