1 files changed, 85 insertions, 4 deletions

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 75f479c..40dc211 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -47,6 +47,7 @@
 // project includes
 #include "llagent.h"
 #include "llbutton.h"
+#include "llcalc.h"
 #include "llcheckboxctrl.h"
 #include "llcolorswatch.h"
 #include "llcombobox.h"
@@ -75,6 +76,10 @@
 
 #include "lldrawpool.h"
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+#include "llvoavatar.h"
+// [/RLVa:KB]
+
 //
 // Constants
 //
@@ -110,6 +115,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);
@@ -342,6 +350,8 @@ void LLPanelObject::getState( )
                 }
         }
 
+        LLCalc* calcp = LLCalc::getInstance();
+        
         LLVOVolume *volobjp = NULL;
         if ( objectp && (objectp->getPCode() == LL_PCODE_VOLUME))
         {
@@ -358,6 +368,7 @@ void LLPanelObject::getState( )
 
                 // Disable all text input fields
                 clearCtrls();
+                calcp->clearAllVariables();
                 return;
         }
 
@@ -366,6 +377,8 @@ 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);
+
         S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
         BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))
                                                  && (selected_count == 1);
@@ -377,6 +390,15 @@ void LLPanelObject::getState( )
                 enable_rotate = FALSE;
         }
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP))) )
+        {
+                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == objectp->getRootEdit()) )
+                        enable_move = enable_scale = enable_rotate = FALSE;
+        }
+// [/RLVa:KB]
+
         LLVector3 vec;
         if (enable_move)
         {
@@ -384,12 +406,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);
         }
 
 
@@ -404,12 +432,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 );
@@ -429,12 +463,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 );
@@ -592,6 +632,10 @@ void LLPanelObject::getState( )
         }
         else
         {
+                mCtrlScaleX->setMaxValue(LLManipScale::getMaxPrimSize());
+                mCtrlScaleY->setMaxValue(LLManipScale::getMaxPrimSize());
+                mCtrlScaleZ->setMaxValue(LLManipScale::getMaxPrimSize());
+
                 // Only allowed to change these parameters for objects
                 // that you have permissions on AND are not attachments.
                 enabled = root_objectp->permModify();
@@ -687,8 +731,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)
@@ -741,6 +786,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();
@@ -759,18 +808,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();
@@ -800,10 +855,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();
@@ -828,6 +885,7 @@ void LLPanelObject::getState( )
                         }
                 }
                 mSpinSkew->set( skew );
+                calcp->setVar(LLCalc::SKEW, skew);
         }
 
         // Compute control visibility, label names, and twist range.
@@ -839,7 +897,7 @@ void LLPanelObject::getState( )
         BOOL top_shear_x_visible                = TRUE;
         BOOL top_shear_y_visible                = TRUE;
         BOOL twist_visible                              = TRUE;
-        BOOL advanced_cut_visible               = FALSE;
+        BOOL advanced_cut_visible               = TRUE;
         BOOL taper_visible                              = FALSE;
         BOOL skew_visible                               = FALSE;
         BOOL radius_offset_visible              = FALSE;
@@ -864,6 +922,7 @@ void LLPanelObject::getState( )
                 //twist_visible                 = FALSE;
                 advanced_cut_visible    = TRUE;
                 advanced_is_dimple              = TRUE;
+                advanced_is_slice               = FALSE;
                 twist_min                               = OBJECT_TWIST_MIN;
                 twist_max                               = OBJECT_TWIST_MAX;
                 twist_inc                               = OBJECT_TWIST_INC;
@@ -877,6 +936,7 @@ void LLPanelObject::getState( )
                 size_is_hole                    = TRUE;
                 skew_visible                    = TRUE;
                 advanced_cut_visible    = TRUE;
+                advanced_is_slice               = FALSE;
                 taper_visible                   = TRUE;
                 radius_offset_visible   = TRUE;
                 revolutions_visible             = TRUE;
@@ -931,6 +991,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);
@@ -945,6 +1007,14 @@ void LLPanelObject::getState( )
                         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;
         }
@@ -1155,7 +1225,7 @@ void LLPanelObject::getState( )
                 mSculptTextureRevert = LLUUID::null;
         }
 
-        
+
         //----------------------------------------------------------------------------
 
         mObject = objectp;
@@ -1920,6 +1990,8 @@ void LLPanelObject::clearCtrls()
         childSetEnabled("advanced_cut", FALSE);
         childSetEnabled("advanced_dimple", FALSE);
         childSetVisible("advanced_slice", FALSE);
+
+        childSetEnabled("build_math_constants",false);
 }
 
 //
@@ -1961,6 +2033,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
@@ -2055,3 +2130,9 @@ void LLPanelObject::onCommitSculptType(LLUICtrl *ctrl, void* userdata)
 
         self->sendSculpt();
 }
+
+// static
+void LLPanelObject::onClickBuildConstants(void *)
+{
+        LLNotifications::instance().add("ClickBuildConstants");
+}