From c06dbf4fe5722fe9db4a5ea3cc353fc2209a4f15 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Sat, 28 Jun 2008 16:13:11 +0000 Subject: [PATCH] Mantis#1620. Applied Melanie's patch --- OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 65 ++++++++++--------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index f83298d199..366673590e 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs @@ -2038,37 +2038,38 @@ namespace OpenSim.Region.Physics.Meshing return mesh; } - private static void reportPrimParams(string name, PrimitiveBaseShape primShape) - { - ; -#if SPAM - float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f; - float pathShearY = primShape.PathShearY < 128 ? (float)primShape.PathShearY * 0.01f : (float)(primShape.PathShearY - 256) * 0.01f; - - Console.WriteLine("********************* PrimitiveBaseShape Parameters *******************\n" - + "Name.............: " + name.ToString() + "\n" - + "HollowShape......: " + primShape.HollowShape.ToString() + "\n" - + "PathBegin........: " + primShape.PathBegin.ToString() + "\n" - + "PathCurve........: " + primShape.PathCurve.ToString() + "\n" - + "PathEnd..........: " + primShape.PathEnd.ToString() + "\n" - + "PathRadiusOffset.: " + primShape.PathRadiusOffset.ToString() + "\n" - + "PathRevolutions..: " + primShape.PathRevolutions.ToString() + "\n" - + "PathScaleX.......: " + primShape.PathScaleX.ToString() + "\n" - + "PathScaleY.......: " + primShape.PathScaleY.ToString() + "\n" - + "PathShearX.......: " + primShape.PathShearX.ToString() + " (" + pathShearX.ToString() + ")\n" - + "PathShearY.......: " + primShape.PathShearY.ToString() + " (" + pathShearY.ToString() + ")\n" - + "PathSkew.........: " + primShape.PathSkew.ToString() + "\n" - + "PathTaperX.......: " + primShape.PathTaperX.ToString() + "\n" - + "PathTaperY.......: " + primShape.PathTaperY.ToString() + "\n" - + "PathTwist........: " + primShape.PathTwist.ToString() + "\n" - + "PathTwistBegin...: " + primShape.PathTwistBegin.ToString() + "\n" - + "ProfileBegin.....: " + primShape.ProfileBegin.ToString() + "\n" - + "ProfileCurve.....: " + primShape.ProfileCurve.ToString() + "\n" - + "ProfileEnd.......: " + primShape.ProfileEnd.ToString() + "\n" - + "ProfileHollow....: " + primShape.ProfileHollow.ToString() + "\n" - + "ProfileShape.....: " + primShape.ProfileShape.ToString() + "\n" - ); -#endif - } +// Commented to kill a warning +// private static void reportPrimParams(string name, PrimitiveBaseShape primShape) +// { +// ; +//#if SPAM +// float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f; +// float pathShearY = primShape.PathShearY < 128 ? (float)primShape.PathShearY * 0.01f : (float)(primShape.PathShearY - 256) * 0.01f; +// +// Console.WriteLine("********************* PrimitiveBaseShape Parameters *******************\n" +// + "Name.............: " + name.ToString() + "\n" +// + "HollowShape......: " + primShape.HollowShape.ToString() + "\n" +// + "PathBegin........: " + primShape.PathBegin.ToString() + "\n" +// + "PathCurve........: " + primShape.PathCurve.ToString() + "\n" +// + "PathEnd..........: " + primShape.PathEnd.ToString() + "\n" +// + "PathRadiusOffset.: " + primShape.PathRadiusOffset.ToString() + "\n" +// + "PathRevolutions..: " + primShape.PathRevolutions.ToString() + "\n" +// + "PathScaleX.......: " + primShape.PathScaleX.ToString() + "\n" +// + "PathScaleY.......: " + primShape.PathScaleY.ToString() + "\n" +// + "PathShearX.......: " + primShape.PathShearX.ToString() + " (" + pathShearX.ToString() + ")\n" +// + "PathShearY.......: " + primShape.PathShearY.ToString() + " (" + pathShearY.ToString() + ")\n" +// + "PathSkew.........: " + primShape.PathSkew.ToString() + "\n" +// + "PathTaperX.......: " + primShape.PathTaperX.ToString() + "\n" +// + "PathTaperY.......: " + primShape.PathTaperY.ToString() + "\n" +// + "PathTwist........: " + primShape.PathTwist.ToString() + "\n" +// + "PathTwistBegin...: " + primShape.PathTwistBegin.ToString() + "\n" +// + "ProfileBegin.....: " + primShape.ProfileBegin.ToString() + "\n" +// + "ProfileCurve.....: " + primShape.ProfileCurve.ToString() + "\n" +// + "ProfileEnd.......: " + primShape.ProfileEnd.ToString() + "\n" +// + "ProfileHollow....: " + primShape.ProfileHollow.ToString() + "\n" +// + "ProfileShape.....: " + primShape.ProfileShape.ToString() + "\n" +// ); +//#endif +// } } }