Merge branch 'main' into release/maint-c

# Conflicts:
#	indra/llui/lltexteditor.cpp
#	indra/newview/llcontrolavatar.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index e06333205f..9267604098 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 ));
@@ -2024,7 +2024,7 @@ void LLPanelObject::onCancelSculpt(const LLSD& data)
 
     if(mSculptTextureRevert == LLUUID::null)
     {
-        mSculptTextureRevert = LLUUID(SCULPT_DEFAULT_TEXTURE);
+        mSculptTextureRevert = SCULPT_DEFAULT_TEXTURE;
     }
     mTextureCtrl->setImageAssetID(mSculptTextureRevert);
 
@@ -2267,7 +2267,7 @@ void LLPanelObject::onCopyParams()
         }
         else
         {
-            mClipboardParams["sculpt"]["id"] = LLUUID(SCULPT_DEFAULT_TEXTURE);
+            mClipboardParams["sculpt"]["id"] = SCULPT_DEFAULT_TEXTURE;
         }
 
         mClipboardParams["sculpt"]["type"] = sculpt_params->getSculptType();