PATH-199: Adding a non-interactive checkbox to the build tools floater.

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 );

indra/newview/llpanelobject.h

@@ -152,6 +152,7 @@ protected:
 	LLCheckBoxCtrl	*mCheckPhysics;
 	LLCheckBoxCtrl	*mCheckTemporary;
 	LLCheckBoxCtrl	*mCheckPhantom;
+	LLCheckBoxCtrl  *mCheckPermanent;
 
 	LLTextureCtrl   *mCtrlSculptTexture;
 	LLTextBox       *mLabelSculptType;

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"