Merge remote-tracking branch 'DRTVWR-600-maint-A' into nat/kwds

1 files changed, 13 insertions, 4 deletions

diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index ac0b5d40a4..b06f41b920 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1766,30 +1766,39 @@ void LLPanelObject::sendSculpt()
 	LLUUID sculpt_id = LLUUID::null;
 
 	if (mCtrlSculptTexture)
+	{
 		sculpt_id = mCtrlSculptTexture->getImageAssetID();
+	}
 
 	U8 sculpt_type = 0;
 	
 	if (mCtrlSculptType)
+	{
 		sculpt_type |= mCtrlSculptType->getValue().asInteger();
+	}
 
 	bool enabled = sculpt_type != LL_SCULPT_TYPE_MESH;
 
 	if (mCtrlSculptMirror)
 	{
-		mCtrlSculptMirror->setEnabled(enabled ? true : false);
+		mCtrlSculptMirror->setEnabled(enabled);
 	}
+
 	if (mCtrlSculptInvert)
 	{
-		mCtrlSculptInvert->setEnabled(enabled ? true : false);
+		mCtrlSculptInvert->setEnabled(enabled);
 	}
-	
+
 	if ((mCtrlSculptMirror) && (mCtrlSculptMirror->get()))
+	{
 		sculpt_type |= LL_SCULPT_FLAG_MIRROR;
+	}
 
 	if ((mCtrlSculptInvert) && (mCtrlSculptInvert->get()))
+	{
 		sculpt_type |= LL_SCULPT_FLAG_INVERT;
-	
+	}
+
 	sculpt_params.setSculptTexture(sculpt_id, sculpt_type);
 	mObject->setParameterEntry(LLNetworkData::PARAMS_SCULPT, sculpt_params, true);
 }