1 files changed, 58 insertions, 3 deletions

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index cc9d969..5cd8690 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -46,6 +46,7 @@
 // project includes
 #include "llagent.h"
 #include "llbutton.h"
+#include "llcalc.h"
 #include "llcheckboxctrl.h"
 #include "llcolorswatch.h"
 #include "llcombobox.h"
@@ -109,6 +110,9 @@ BOOL	LLPanelObject::postBuild()
         // Top
         //--------------------------------------------------------
         
+        // Build constant tipsheet
+        childSetAction("build_math_constants",onClickBuildConstants,this);
+
         // Lock checkbox
         mCheckLock = getChild<LLCheckBoxCtrl>("checkbox locked");
         childSetCommitCallback("checkbox locked",onCommitLock,this);
@@ -341,6 +345,8 @@ void LLPanelObject::getState( )
                 }
         }
 
+        LLCalc* calcp = LLCalc::getInstance();
+        
         LLVOVolume *volobjp = NULL;
         if ( objectp && (objectp->getPCode() == LL_PCODE_VOLUME))
         {
@@ -357,6 +363,7 @@ void LLPanelObject::getState( )
 
                 // Disable all text input fields
                 clearCtrls();
+                calcp->clearAllVariables();
                 return;
         }
 
@@ -365,6 +372,7 @@ void LLPanelObject::getState( )
         BOOL enable_scale       = objectp->permMove() && objectp->permModify();
         BOOL enable_rotate      = objectp->permMove() && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
 
+        childSetEnabled("build_math_constants",true);
         LLVector3 vec;
         if (enable_move)
         {
@@ -372,12 +380,18 @@ void LLPanelObject::getState( )
                 mCtrlPosX->set( vec.mV[VX] );
                 mCtrlPosY->set( vec.mV[VY] );
                 mCtrlPosZ->set( vec.mV[VZ] );
+                calcp->setVar(LLCalc::X_POS, vec.mV[VX]);
+                calcp->setVar(LLCalc::Y_POS, vec.mV[VY]);
+                calcp->setVar(LLCalc::Z_POS, vec.mV[VZ]);
         }
         else
         {
                 mCtrlPosX->clear();
                 mCtrlPosY->clear();
                 mCtrlPosZ->clear();
+                calcp->clearVar(LLCalc::X_POS);
+                calcp->clearVar(LLCalc::Y_POS);
+                calcp->clearVar(LLCalc::Z_POS);
         }
 
 
@@ -392,12 +406,18 @@ void LLPanelObject::getState( )
                 mCtrlScaleX->set( vec.mV[VX] );
                 mCtrlScaleY->set( vec.mV[VY] );
                 mCtrlScaleZ->set( vec.mV[VZ] );
+                calcp->setVar(LLCalc::X_SCALE, vec.mV[VX]);
+                calcp->setVar(LLCalc::Y_SCALE, vec.mV[VY]);
+                calcp->setVar(LLCalc::Z_SCALE, vec.mV[VZ]);
         }
         else
         {
                 mCtrlScaleX->clear();
                 mCtrlScaleY->clear();
                 mCtrlScaleZ->clear();
+                calcp->setVar(LLCalc::X_SCALE, 0.f);
+                calcp->setVar(LLCalc::Y_SCALE, 0.f);
+                calcp->setVar(LLCalc::Z_SCALE, 0.f);
         }
 
         mLabelSize->setEnabled( enable_scale );
@@ -417,12 +437,18 @@ void LLPanelObject::getState( )
                 mCtrlRotX->set( mCurEulerDegrees.mV[VX] );
                 mCtrlRotY->set( mCurEulerDegrees.mV[VY] );
                 mCtrlRotZ->set( mCurEulerDegrees.mV[VZ] );
+                calcp->setVar(LLCalc::X_ROT, mCurEulerDegrees.mV[VX]);
+                calcp->setVar(LLCalc::Y_ROT, mCurEulerDegrees.mV[VY]);
+                calcp->setVar(LLCalc::Z_ROT, mCurEulerDegrees.mV[VZ]);
         }
         else
         {
                 mCtrlRotX->clear();
                 mCtrlRotY->clear();
                 mCtrlRotZ->clear();
+                calcp->clearVar(LLCalc::X_ROT);
+                calcp->clearVar(LLCalc::Y_ROT);
+                calcp->clearVar(LLCalc::Z_ROT);
         }
 
         mLabelRotation->setEnabled( enable_rotate );
@@ -678,8 +704,9 @@ void LLPanelObject::getState( )
                 F32 end_t       = volume_params.getEndT();
 
                 // Hollowness
-                F32 hollow = volume_params.getHollow();
-                mSpinHollow->set( 100.f * hollow );
+                F32 hollow = 100.f * volume_params.getHollow();
+                mSpinHollow->set( hollow );
+                calcp->setVar(LLCalc::HOLLOW, hollow);
 
                 // All hollow objects allow a shape to be selected.
                 if (hollow > 0.f)
@@ -732,6 +759,10 @@ void LLPanelObject::getState( )
                 mSpinCutEnd             ->set( cut_end );
                 mCtrlPathBegin  ->set( adv_cut_begin );
                 mCtrlPathEnd    ->set( adv_cut_end );
+                calcp->setVar(LLCalc::CUT_BEGIN, cut_begin);
+                calcp->setVar(LLCalc::CUT_END, cut_end);
+                calcp->setVar(LLCalc::PATH_BEGIN, adv_cut_begin);
+                calcp->setVar(LLCalc::PATH_END, adv_cut_end);
 
                 // Twist
                 F32 twist               = volume_params.getTwist();
@@ -750,18 +781,24 @@ void LLPanelObject::getState( )
 
                 mSpinTwist              ->set( twist );
                 mSpinTwistBegin ->set( twist_begin );
+                calcp->setVar(LLCalc::TWIST_END, twist);
+                calcp->setVar(LLCalc::TWIST_BEGIN, twist_begin);
 
                 // Shear
                 F32 shear_x = volume_params.getShearX();
                 F32 shear_y = volume_params.getShearY();
                 mSpinShearX->set( shear_x );
                 mSpinShearY->set( shear_y );
+                calcp->setVar(LLCalc::X_SHEAR, shear_x);
+                calcp->setVar(LLCalc::Y_SHEAR, shear_y);
 
                 // Taper
                 F32 taper_x     = volume_params.getTaperX();
                 F32 taper_y = volume_params.getTaperY();
                 mSpinTaperX->set( taper_x );
                 mSpinTaperY->set( taper_y );
+                calcp->setVar(LLCalc::X_TAPER, taper_x);
+                calcp->setVar(LLCalc::Y_TAPER, taper_y);
 
                 // Radius offset.
                 F32 radius_offset = volume_params.getRadiusOffset();
@@ -791,10 +828,12 @@ void LLPanelObject::getState( )
                         }
                 }
                 mSpinRadiusOffset->set( radius_offset);
+                calcp->setVar(LLCalc::RADIUS_OFFSET, radius_offset);
 
                 // Revolutions
                 F32 revolutions = volume_params.getRevolutions();
                 mSpinRevolutions->set( revolutions );
+                calcp->setVar(LLCalc::REVOLUTIONS, revolutions);
                 
                 // Skew
                 F32 skew        = volume_params.getSkew();
@@ -819,6 +858,7 @@ void LLPanelObject::getState( )
                         }
                 }
                 mSpinSkew->set( skew );
+                calcp->setVar(LLCalc::SKEW, skew);
         }
 
         // Compute control visibility, label names, and twist range.
@@ -924,6 +964,8 @@ void LLPanelObject::getState( )
         case MI_RING:
                 mSpinScaleX->set( scale_x );
                 mSpinScaleY->set( scale_y );
+                calcp->setVar(LLCalc::X_HOLE, scale_x);
+                calcp->setVar(LLCalc::Y_HOLE, scale_y);
                 mSpinScaleX->setMinValue(OBJECT_MIN_HOLE_SIZE);
                 mSpinScaleX->setMaxValue(OBJECT_MAX_HOLE_SIZE_X);
                 mSpinScaleY->setMinValue(OBJECT_MIN_HOLE_SIZE);
@@ -934,6 +976,8 @@ 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);
@@ -1148,7 +1192,7 @@ void LLPanelObject::getState( )
                 mSculptTextureRevert = LLUUID::null;
         }
 
-        
+
         //----------------------------------------------------------------------------
 
         mObject = objectp;
@@ -1913,6 +1957,8 @@ void LLPanelObject::clearCtrls()
         childSetEnabled( "advanced_cut", FALSE );
         childSetEnabled( "advanced_dimple", FALSE );
         childSetVisible("advanced_slice", FALSE);
+
+        childSetEnabled("build_math_constants",false);
 }
 
 //
@@ -1954,6 +2000,9 @@ void LLPanelObject::onCommitRotation( LLUICtrl* ctrl, void* userdata )
         LLPanelObject* self = (LLPanelObject*) userdata;
         BOOL btn_down = ((LLSpinCtrl*)ctrl)->isMouseHeldDown() ;
         self->sendRotation(btn_down);
+
+        // Needed to ensure all rotations are shown consistently in range
+        self->refresh();
 }
 
 // static
@@ -2048,3 +2097,9 @@ void LLPanelObject::onCommitSculptType(LLUICtrl *ctrl, void* userdata)
 
         self->sendSculpt();
 }
+
+// static
+void LLPanelObject::onClickBuildConstants(void *)
+{
+        gViewerWindow->alertXml("ClickBuildConstants");
+}