aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelface.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpanelface.cpp11
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 @@
61#include "llviewermedia.h" 61#include "llviewermedia.h"
62#include "llviewerobject.h" 62#include "llviewerobject.h"
63#include "llviewerstats.h" 63#include "llviewerstats.h"
64#include "llviewerwindow.h"
64#include "lluictrlfactory.h" 65#include "lluictrlfactory.h"
65 66
66// 67//
@@ -180,6 +181,7 @@ BOOL LLPanelFace::postBuild()
180 childSetCommitCallback("TexOffsetU",LLPanelFace::onCommitTextureInfo, this); 181 childSetCommitCallback("TexOffsetU",LLPanelFace::onCommitTextureInfo, this);
181 childSetCommitCallback("TexOffsetV",LLPanelFace::onCommitTextureInfo, this); 182 childSetCommitCallback("TexOffsetV",LLPanelFace::onCommitTextureInfo, this);
182 childSetAction("button align",onClickAutoFix,this); 183 childSetAction("button align",onClickAutoFix,this);
184 childSetAction("texture_math_constants",onClickTextureConstants,this);
183 185
184 clearCtrls(); 186 clearCtrls();
185 187
@@ -756,6 +758,7 @@ void LLPanelFace::getState()
756 childSetEnabled("button apply",enabled); 758 childSetEnabled("button apply",enabled);
757 } 759 }
758 } 760 }
761 childSetEnabled("texture_math_constants",true);
759 762
760 // Set variable values for numeric expressions 763 // Set variable values for numeric expressions
761 calcp->setVar(LLCalc::TEX_U_SCALE, childGetValue("TexScaleU").asReal()); 764 calcp->setVar(LLCalc::TEX_U_SCALE, childGetValue("TexScaleU").asReal());
@@ -799,6 +802,8 @@ void LLPanelFace::getState()
799 childSetEnabled("button align",FALSE); 802 childSetEnabled("button align",FALSE);
800 childSetEnabled("button apply",FALSE); 803 childSetEnabled("button apply",FALSE);
801 804
805 childSetEnabled("texture_math_constants",false);
806
802 // Set variable values for numeric expressions 807 // Set variable values for numeric expressions
803 calcp->clearVar(LLCalc::TEX_U_SCALE); 808 calcp->clearVar(LLCalc::TEX_U_SCALE);
804 calcp->clearVar(LLCalc::TEX_V_SCALE); 809 calcp->clearVar(LLCalc::TEX_V_SCALE);
@@ -989,3 +994,9 @@ void LLPanelFace::onClickAutoFix(void* userdata)
989 LLPanelFaceSendFunctor sendfunc; 994 LLPanelFaceSendFunctor sendfunc;
990 LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc); 995 LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
991} 996}
997
998// static
999void LLPanelFace::onClickTextureConstants(void *)
1000{
1001 gViewerWindow->alertXml("ClickTextureConstants");
1002} \ No newline at end of file