Added cheat sheet help buttons in tools window, tweaked the layout a bit

1 files changed, 11 insertions, 0 deletions

diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index e9555c6..d1c34f1 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -61,6 +61,7 @@
 #include "llviewermedia.h"
 #include "llviewerobject.h"
 #include "llviewerstats.h"
+#include "llviewerwindow.h"
 #include "lluictrlfactory.h"
 
 //
@@ -180,6 +181,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();
 
@@ -756,6 +758,7 @@ 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());
@@ -799,6 +802,8 @@ 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);
@@ -989,3 +994,9 @@ void LLPanelFace::onClickAutoFix(void* userdata)
         LLPanelFaceSendFunctor sendfunc;
         LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
 }
+
+// static
+void LLPanelFace::onClickTextureConstants(void *)
+{
+        gViewerWindow->alertXml("ClickTextureConstants");
+}
\ No newline at end of file