From 90240de9f5f4f1fe62378df1782d5e37b8030b6f Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 30 Jan 2009 19:29:21 -0600
Subject: Made build math taper/hole size correct for box/etc. [#62]

---
 linden/indra/newview/llpanelobject.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 5cd8690..584ecb8 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -976,12 +976,18 @@ void LLPanelObject::getState( )
 		{
 			mSpinScaleX->set( 1.f - scale_x );
 			mSpinScaleY->set( 1.f - scale_y );
-			calcp->setVar(LLCalc::X_HOLE, 1.f - scale_x);
-			calcp->setVar(LLCalc::Y_HOLE, 1.f - scale_y);
 			mSpinScaleX->setMinValue(-1.f);
 			mSpinScaleX->setMaxValue(1.f);
 			mSpinScaleY->setMinValue(-1.f);
 			mSpinScaleY->setMaxValue(1.f);
+
+			// Torus' Hole Size is Box/Cyl/Prism's Taper
+			calcp->setVar(LLCalc::X_TAPER, 1.f - scale_x);
+			calcp->setVar(LLCalc::Y_TAPER, 1.f - scale_y);
+
+			// Box/Cyl/Prism have no hole size
+			calcp->setVar(LLCalc::X_HOLE, 0.f);
+			calcp->setVar(LLCalc::Y_HOLE, 0.f);
 		}
 		break;
 	}
-- 
cgit v1.1