Skip to content
Snippets Groups Projects
Commit 379b480f authored by maxim_productengine's avatar maxim_productengine
Browse files

SL-11944 FIXED [Project Copy/Paste] The prim's shape can be changed by pasting empty parameters

parent 1b66e467
No related branches found
No related tags found
1 merge request!83Merge Linden 6.6.7
...@@ -314,6 +314,7 @@ LLPanelObject::LLPanelObject() ...@@ -314,6 +314,7 @@ LLPanelObject::LLPanelObject()
mSculptTextureRevert(LLUUID::null), mSculptTextureRevert(LLUUID::null),
mSculptTypeRevert(0), mSculptTypeRevert(0),
mSizeChanged(FALSE), mSizeChanged(FALSE),
mHasParamsClipboard(FALSE),
mHasPosClipboard(FALSE), mHasPosClipboard(FALSE),
mHasSizeClipboard(FALSE), mHasSizeClipboard(FALSE),
mHasRotClipboard(FALSE) mHasRotClipboard(FALSE)
...@@ -473,7 +474,7 @@ void LLPanelObject::getState( ) ...@@ -473,7 +474,7 @@ void LLPanelObject::getState( )
mBtnPasteRot->setEnabled( enable_rotate && mHasRotClipboard ); mBtnPasteRot->setEnabled( enable_rotate && mHasRotClipboard );
mBtnCopyParams->setEnabled( single_volume && enable_modify ); mBtnCopyParams->setEnabled( single_volume && enable_modify );
mBtnPasteParams->setEnabled( single_volume && enable_modify ); mBtnPasteParams->setEnabled( single_volume && enable_modify && mHasParamsClipboard );
LLUUID owner_id; LLUUID owner_id;
std::string owner_name; std::string owner_name;
...@@ -2284,13 +2285,13 @@ void LLPanelObject::onCopyParams(const LLSD& data) ...@@ -2284,13 +2285,13 @@ void LLPanelObject::onCopyParams(const LLSD& data)
mParamsClipboard["physics_material"] = material_code; mParamsClipboard["physics_material"] = material_code;
} }
} }
mBtnPasteParams->setEnabled(TRUE);
} }
void LLPanelObject::onPasteParams(const LLSD& data) void LLPanelObject::onPasteParams(const LLSD& data)
{ {
LLViewerObject* objectp = mObject; LLViewerObject* objectp = mObject;
if (!objectp) if (!objectp || !mHasParamsClipboard)
{ {
return; return;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment