From 379b480f0e9d6947f0da8f15dbcb7e7010f0509a Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 1 Oct 2019 15:44:05 +0300
Subject: [PATCH] SL-11944 FIXED [Project Copy/Paste] The prim's shape can be
changed by pasting empty parameters
---
indra/newview/llpanelobject.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 1e462876ee5..3c41a4bce42 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -314,6 +314,7 @@ LLPanelObject::LLPanelObject()
mSculptTextureRevert(LLUUID::null),
mSculptTypeRevert(0),
mSizeChanged(FALSE),
+ mHasParamsClipboard(FALSE),
mHasPosClipboard(FALSE),
mHasSizeClipboard(FALSE),
mHasRotClipboard(FALSE)
@@ -473,7 +474,7 @@ void LLPanelObject::getState( )
mBtnPasteRot->setEnabled( enable_rotate && mHasRotClipboard );
mBtnCopyParams->setEnabled( single_volume && enable_modify );
- mBtnPasteParams->setEnabled( single_volume && enable_modify );
+ mBtnPasteParams->setEnabled( single_volume && enable_modify && mHasParamsClipboard );
LLUUID owner_id;
std::string owner_name;
@@ -2284,13 +2285,13 @@ void LLPanelObject::onCopyParams(const LLSD& data)
mParamsClipboard["physics_material"] = material_code;
}
}
-
+ mBtnPasteParams->setEnabled(TRUE);
}
void LLPanelObject::onPasteParams(const LLSD& data)
{
LLViewerObject* objectp = mObject;
- if (!objectp)
+ if (!objectp || !mHasParamsClipboard)
{
return;
}
--
GitLab