Applied Aimee's patch for doing simple math in the build editor

1 files changed, 20 insertions, 0 deletions

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);              
         }
 }