From 145a5ffe7f57ec87b0604c2e06104a4eb3cb8644 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 22 Sep 2023 01:01:42 +0300
Subject: SL-15039 Prune unused preferences #3

DebugInventoryFilters
DebugShowXUINames
DebugSlshareLogTag
DebugStat****
DefaultBlankNormalTexture
DefaultObjectNormalTexture
DefaultObjectSpecularTexture
DefaultUploadCost
DisplayAvatarAgentTarget
DisplayChat
DisplayDebug
DisplayDebugConsole
DisplayIM
DisplayLinden
DisplayRegion
DragAndDropToolTipDelay
DragAndDropDistanceThreshold
DropShadowButton
DropShadowFloater
DropShadowSlider
DropShadowTooltip
UIImgWhiteUUID
UseEnvironmentFromRegion
UseDayCycle
WaterPresetName
SkyPresetName
DayCycleName
DestinationGuideHintTimeout
SidePanelHintTimeout
DisablePrecacheDelayAfterTeleporting
---
 indra/newview/llpanelobject.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llpanelobject.cpp')

diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 2da431955f..c8256640f2 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -244,7 +244,7 @@ BOOL	LLPanelObject::postBuild()
 	mCtrlSculptTexture = getChild<LLTextureCtrl>("sculpt texture control");
 	if (mCtrlSculptTexture)
 	{
-		mCtrlSculptTexture->setDefaultImageAssetID(LLUUID(SCULPT_DEFAULT_TEXTURE));
+		mCtrlSculptTexture->setDefaultImageAssetID(SCULPT_DEFAULT_TEXTURE);
 		mCtrlSculptTexture->setCommitCallback( boost::bind(&LLPanelObject::onCommitSculpt, this, _2 ));
 		mCtrlSculptTexture->setOnCancelCallback( boost::bind(&LLPanelObject::onCancelSculpt, this, _2 ));
 		mCtrlSculptTexture->setOnSelectCallback( boost::bind(&LLPanelObject::onSelectSculpt, this, _2 ));
@@ -2026,7 +2026,7 @@ void LLPanelObject::onCancelSculpt(const LLSD& data)
 
 	if(mSculptTextureRevert == LLUUID::null)
 	{
-		mSculptTextureRevert = LLUUID(SCULPT_DEFAULT_TEXTURE);
+		mSculptTextureRevert = SCULPT_DEFAULT_TEXTURE;
 	}
 	mTextureCtrl->setImageAssetID(mSculptTextureRevert);
 	
@@ -2269,7 +2269,7 @@ void LLPanelObject::onCopyParams()
         }
         else
         {
-            mClipboardParams["sculpt"]["id"] = LLUUID(SCULPT_DEFAULT_TEXTURE);
+            mClipboardParams["sculpt"]["id"] = SCULPT_DEFAULT_TEXTURE;
         }
 
         mClipboardParams["sculpt"]["type"] = sculpt_params->getSculptType();
-- 
cgit v1.2.3