From ca1c1eea78ff2ab83979a4308dd5a93ea0032fc8 Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Wed, 19 Jan 2011 11:38:34 -0800
Subject: SH-808 Selectively enable/disable features in edit tools

---
 indra/newview/llfloatertools.cpp |  7 +++++++
 indra/newview/llpanelobject.cpp  | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 920bdef7f6..49e24f8e3d 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -463,6 +463,13 @@ void LLFloaterTools::refresh()
 	childSetEnabled("linked_set_cost", have_selection);
 	childSetEnabled("object_cost", have_selection);
 
+	bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled");
+
+	getChildView("linked_set_count")->setVisible(enable_mesh);
+	getChildView("linked_set_cost")->setVisible(enable_mesh);
+	getChildView("object_count")->setVisible(enable_mesh);
+	getChildView("object_cost")->setVisible(enable_mesh);
+
 	// Refresh child tabs
 	mPanelPermissions->refresh();
 	mPanelObject->refresh();
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 45e9a04fc2..73a8fbe3aa 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1910,6 +1910,32 @@ void LLPanelObject::refresh()
 	{
 		mRootObject = NULL;
 	}
+	
+	bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled");
+
+	getChildView("label physicsshapetype")->setVisible(enable_mesh);
+	getChildView("Physics Shape Type Combo Ctrl")->setVisible(enable_mesh);
+	getChildView("Physics Gravity")->setVisible(enable_mesh);
+	getChildView("Physics Material Override")->setVisible(enable_mesh);
+	getChildView("Physics Friction")->setVisible(enable_mesh);
+	getChildView("Physics Density")->setVisible(enable_mesh);
+	getChildView("Physics Restitution")->setVisible(enable_mesh);
+
+	// if mesh isn't enabled we want to the scale max to be 10
+	getChild<LLSpinCtrl>("Scale X")->setMaxValue(enable_mesh ? 64 : 10);
+	getChild<LLSpinCtrl>("Scale Y")->setMaxValue(enable_mesh ? 64 : 10);
+	getChild<LLSpinCtrl>("Scale Z")->setMaxValue(enable_mesh ? 64 : 10);
+
+	LLComboBox* sculpt_combo = getChild<LLComboBox>("sculpt type control");
+	BOOL found = sculpt_combo->itemExists("Mesh");
+	if (enable_mesh && !found)
+	{
+		sculpt_combo->add("Mesh");
+	}
+	else if (!enable_mesh && found)
+	{
+		sculpt_combo->remove("Mesh");
+	}
 }
 
 
-- 
cgit v1.2.3