2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ce78186..cbfef11 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -4,6 +4,9 @@
 
 2009-01-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * linden/indra/newview/llpanelobject.cpp:
+        Made build math taper/hole size correct for box/etc. [#62]
+
         * linden/indra/llaudio/audioengine_openal.cpp:
         Disabled spammy loadWAV error for nonexistent files.
         
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;
         }