livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
maxim_productengine 2019-10-01 15:44:05 +03:00
parent 1b66e4673d
commit 379b480f0e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llpanelobject.cpp
View File

@ -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;
}