aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelobject.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-01-12 07:18:00 -0700
committerMcCabe Maxsted2009-01-12 07:18:00 -0700
commit642acca6218595aae029ec4eabe2aa5e05190f45 (patch)
tree14b455c82b9d56862ab54e3cde0dadfee75a74a3 /linden/indra/newview/llpanelobject.cpp
parentApplied Aimee's patch for doing simple math in the build editor (diff)
downloadmeta-impy-642acca6218595aae029ec4eabe2aa5e05190f45.zip
meta-impy-642acca6218595aae029ec4eabe2aa5e05190f45.tar.gz
meta-impy-642acca6218595aae029ec4eabe2aa5e05190f45.tar.bz2
meta-impy-642acca6218595aae029ec4eabe2aa5e05190f45.tar.xz
Added cheat sheet help buttons in tools window, tweaked the layout a bit
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpanelobject.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 8efa39a..5cd8690 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -110,6 +110,9 @@ BOOL LLPanelObject::postBuild()
110 // Top 110 // Top
111 //-------------------------------------------------------- 111 //--------------------------------------------------------
112 112
113 // Build constant tipsheet
114 childSetAction("build_math_constants",onClickBuildConstants,this);
115
113 // Lock checkbox 116 // Lock checkbox
114 mCheckLock = getChild<LLCheckBoxCtrl>("checkbox locked"); 117 mCheckLock = getChild<LLCheckBoxCtrl>("checkbox locked");
115 childSetCommitCallback("checkbox locked",onCommitLock,this); 118 childSetCommitCallback("checkbox locked",onCommitLock,this);
@@ -369,6 +372,7 @@ void LLPanelObject::getState( )
369 BOOL enable_scale = objectp->permMove() && objectp->permModify(); 372 BOOL enable_scale = objectp->permMove() && objectp->permModify();
370 BOOL enable_rotate = objectp->permMove() && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts")); 373 BOOL enable_rotate = objectp->permMove() && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
371 374
375 childSetEnabled("build_math_constants",true);
372 LLVector3 vec; 376 LLVector3 vec;
373 if (enable_move) 377 if (enable_move)
374 { 378 {
@@ -1953,6 +1957,8 @@ void LLPanelObject::clearCtrls()
1953 childSetEnabled( "advanced_cut", FALSE ); 1957 childSetEnabled( "advanced_cut", FALSE );
1954 childSetEnabled( "advanced_dimple", FALSE ); 1958 childSetEnabled( "advanced_dimple", FALSE );
1955 childSetVisible("advanced_slice", FALSE); 1959 childSetVisible("advanced_slice", FALSE);
1960
1961 childSetEnabled("build_math_constants",false);
1956} 1962}
1957 1963
1958// 1964//
@@ -2091,3 +2097,9 @@ void LLPanelObject::onCommitSculptType(LLUICtrl *ctrl, void* userdata)
2091 2097
2092 self->sendSculpt(); 2098 self->sendSculpt();
2093} 2099}
2100
2101// static
2102void LLPanelObject::onClickBuildConstants(void *)
2103{
2104 gViewerWindow->alertXml("ClickBuildConstants");
2105}