1 files changed, 31 insertions, 0 deletions

diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index b1a38e0..9754d2a 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -36,6 +36,7 @@
 #include "llpanelface.h"
  
 // library includes
+#include "llcalc.h"
 #include "llerror.h"
 #include "llfocusmgr.h"
 #include "llrect.h"
@@ -61,6 +62,7 @@
 #include "llviewermedia.h"
 #include "llviewerobject.h"
 #include "llviewerstats.h"
+#include "llviewerwindow.h"
 #include "lluictrlfactory.h"
 
 //
@@ -180,6 +182,7 @@ BOOL	LLPanelFace::postBuild()
         childSetCommitCallback("TexOffsetU",LLPanelFace::onCommitTextureInfo, this);
         childSetCommitCallback("TexOffsetV",LLPanelFace::onCommitTextureInfo, this);
         childSetAction("button align",onClickAutoFix,this);
+        childSetAction("texture_math_constants",onClickTextureConstants,this);
 
         clearCtrls();
 
@@ -382,6 +385,7 @@ void LLPanelFace::sendTextureInfo()
 void LLPanelFace::getState()
 {
         LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+        LLCalc* calcp = LLCalc::getInstance();
 
         if( objectp
                 && objectp->getPCode() == LL_PCODE_VOLUME
@@ -755,6 +759,16 @@ void LLPanelFace::getState()
                                 childSetEnabled("button apply",enabled);
                         }
                 }
+                childSetEnabled("texture_math_constants",true);
+
+                // 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
         {
@@ -790,6 +804,17 @@ void LLPanelFace::getState()
 
                 childSetEnabled("button align",FALSE);
                 childSetEnabled("button apply",FALSE);
+
+                childSetEnabled("texture_math_constants",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);              
         }
 }
 
@@ -972,3 +997,9 @@ void LLPanelFace::onClickAutoFix(void* userdata)
         LLPanelFaceSendFunctor sendfunc;
         LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
 }
+
+// static
+void LLPanelFace::onClickTextureConstants(void *)
+{
+        gViewerWindow->alertXml("ClickTextureConstants");
+}