From b7aa6803a1f34de0cce9a88f9ecd9c7827c4bb52 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 21 Mar 2012 15:15:59 -0700
Subject: [PATCH] PATH-199: Adding a non-interactive checkbox to the build
tools floater.
---
indra/newview/llpanelobject.cpp | 8 ++++++++
indra/newview/llpanelobject.h | 1 +
indra/newview/skins/default/xui/en/floater_tools.xml | 8 ++++++++
3 files changed, 17 insertions(+)
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 26f4b09b304..f0cd0f5d190 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -121,6 +121,9 @@ BOOL LLPanelObject::postBuild()
mCheckPhantom = getChild<LLCheckBoxCtrl>("Phantom Checkbox Ctrl");
childSetCommitCallback("Phantom Checkbox Ctrl",onCommitPhantom,this);
+ // Permanent checkbox
+ mCheckPermanent = getChild<LLCheckBoxCtrl>("Permanent Checkbox Ctrl");
+
// Position
mLabelPosition = getChild<LLTextBox>("label position");
@@ -514,6 +517,9 @@ void LLPanelObject::getState( )
mCheckPhantom->set( mIsPhantom );
mCheckPhantom->setEnabled( roots_selected>0 && editable && !is_flexible );
+ mCheckPermanent->set( root_objectp->flagObjectPermanent() );
+ mCheckPermanent->setEnabled( FALSE );
+
//----------------------------------------------------------------------------
@@ -1866,6 +1872,8 @@ void LLPanelObject::clearCtrls()
mCheckTemporary ->setEnabled( FALSE );
mCheckPhantom ->set(FALSE);
mCheckPhantom ->setEnabled( FALSE );
+ mCheckPermanent ->set(FALSE);
+ mCheckPermanent ->setEnabled( FALSE );
// Disable text labels
mLabelPosition ->setEnabled( FALSE );
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index 8c94c991511..b606ef50448 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -152,6 +152,7 @@ class LLPanelObject : public LLPanel
LLCheckBoxCtrl *mCheckPhysics;
LLCheckBoxCtrl *mCheckTemporary;
LLCheckBoxCtrl *mCheckPhantom;
+ LLCheckBoxCtrl *mCheckPermanent;
LLTextureCtrl *mCtrlSculptTexture;
LLTextBox *mLabelSculptType;
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 2d63c94fe11..0f390217d1d 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1354,6 +1354,14 @@ even though the user gets a free copy.
tool_tip="Causes object to not collide with other objects or avatars"
top_pad="0"
width="123" />
+ <check_box
+ height="19"
+ enabled="false"
+ label="Permanent"
+ layout="topleft"
+ name="Permanent Checkbox Ctrl"
+ top_pad="0"
+ width="123" />
<text
type="string"
--
GitLab