4 files changed, 78 insertions, 12 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 2cf418e..64402e3 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -109,6 +109,7 @@
 #include "llpostprocess.h"
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
+#include "llcalc.h"
 
 #include "lldebugview.h"
 #include "llconsole.h"
@@ -1176,6 +1177,8 @@ bool LLAppViewer::cleanup()
         LLNotifyBox::cleanup();
 
         LLWorldMap::getInstance()->reset(); // release any images
+
+        LLCalc::cleanUp();
         
         llinfos << "Global stuff deleted" << llendflush;
 
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index 4742627..e9555c6 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -35,6 +35,7 @@
 #include "llpanelface.h"
  
 // library includes
+#include "llcalc.h"
 #include "llerror.h"
 #include "llfocusmgr.h"
 #include "llrect.h"
@@ -381,6 +382,7 @@ void LLPanelFace::sendTextureInfo()
 void LLPanelFace::getState()
 {
         LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+        LLCalc* calcp = LLCalc::getInstance();
 
         if( objectp
                 && objectp->getPCode() == LL_PCODE_VOLUME
@@ -754,6 +756,15 @@ void LLPanelFace::getState()
                                 childSetEnabled("button apply",enabled);
                         }
                 }
+
+                // Set variable values for numeric expressions
+                calcp->setVar(LLCalc::TEX_U_SCALE, childGetValue("TexScaleU").asReal());
+                calcp->setVar(LLCalc::TEX_V_SCALE, childGetValue("TexScaleV").asReal());
+                calcp->setVar(LLCalc::TEX_U_OFFSET, childGetValue("TexOffsetU").asReal());
+                calcp->setVar(LLCalc::TEX_V_OFFSET, childGetValue("TexOffsetV").asReal());
+                calcp->setVar(LLCalc::TEX_ROTATION, childGetValue("TexRot").asReal());
+                calcp->setVar(LLCalc::TEX_TRANSPARENCY, childGetValue("ColorTrans").asReal());
+                calcp->setVar(LLCalc::TEX_GLOW, childGetValue("glow").asReal());
         }
         else
         {
@@ -787,6 +798,15 @@ void LLPanelFace::getState()
 
                 childSetEnabled("button align",FALSE);
                 childSetEnabled("button apply",FALSE);
+
+                // Set variable values for numeric expressions
+                calcp->clearVar(LLCalc::TEX_U_SCALE);
+                calcp->clearVar(LLCalc::TEX_V_SCALE);
+                calcp->clearVar(LLCalc::TEX_U_OFFSET);
+                calcp->clearVar(LLCalc::TEX_V_OFFSET);
+                calcp->clearVar(LLCalc::TEX_ROTATION);
+                calcp->clearVar(LLCalc::TEX_TRANSPARENCY);
+                calcp->clearVar(LLCalc::TEX_GLOW);              
         }
 }
 
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index cc9d969..8efa39a 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"
@@ -341,6 +342,8 @@ void LLPanelObject::getState( )
                 }
         }
 
+        LLCalc* calcp = LLCalc::getInstance();
+        
         LLVOVolume *volobjp = NULL;
         if ( objectp && (objectp->getPCode() == LL_PCODE_VOLUME))
         {
@@ -357,6 +360,7 @@ void LLPanelObject::getState( )
 
                 // Disable all text input fields
                 clearCtrls();
+                calcp->clearAllVariables();
                 return;
         }
 
@@ -372,12 +376,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 +402,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 +433,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 +700,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 +755,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 +777,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 +824,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 +854,7 @@ void LLPanelObject::getState( )
                         }
                 }
                 mSpinSkew->set( skew );
+                calcp->setVar(LLCalc::SKEW, skew);
         }
 
         // Compute control visibility, label names, and twist range.
@@ -924,6 +960,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 +972,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 +1188,7 @@ void LLPanelObject::getState( )
                 mSculptTextureRevert = LLUUID::null;
         }
 
-        
+
         //----------------------------------------------------------------------------
 
         mObject = objectp;
@@ -1954,6 +1994,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
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 742da45..05cf101 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -614,15 +614,15 @@
                         <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="X" label_width="10" left="10"
                              max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
-                             text_enabled_color="110, 15, 15, 255" width="87" />
+                             text_enabled_color="110, 15, 15, 255" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
                              max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
-                             text_enabled_color="0, 100, 40, 255" width="87" />
+                             text_enabled_color="0, 100, 40, 255" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
                              max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
-                             text_enabled_color="0, 67, 132, 255" width="87" />
+                             text_enabled_color="0, 67, 132, 255" width="96" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -632,15 +632,15 @@
                         <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="X" label_width="10" left="10"
                              max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
                              max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
                              max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -650,15 +650,15 @@
                         <spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
                              increment="1" initial_val="0" label="X" label_width="10" left="10"
                              max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
                              increment="1" initial_val="0" label="Y" label_width="10" left="10"
                              max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
                              increment="1" initial_val="0" label="Z" label_width="10" left="10"
                              max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
+                             text_enabled_color="1, 1, 1, 1" width="96" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"