diff options
| author | Kadah_Coba <kadah.coba@gmail.com> | 2019-10-14 20:44:51 -0700 |
|---|---|---|
| committer | Kadah_Coba <kadah.coba@gmail.com> | 2019-10-14 20:44:51 -0700 |
| commit | add146291737c6b9b4d773b3a910c9506b4939b3 (patch) | |
| tree | f43e349d7790ed7633eca114e886afbeca9bebc8 /indra/newview/llpanelobject.cpp | |
| parent | 1e1707d532560583744bb877adfed11864f2db31 (diff) | |
| parent | 379b480f0e9d6947f0da8f15dbcb7e7010f0509a (diff) | |
Merged in andreyl_productengine/486-copypaste
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index e53f03785f..a382813de6 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -316,6 +316,7 @@ LLPanelObject::LLPanelObject() mSculptTextureRevert(LLUUID::null), mSculptTypeRevert(0), mSizeChanged(FALSE), + mHasParamsClipboard(FALSE), mHasPosClipboard(FALSE), mHasSizeClipboard(FALSE), mHasRotClipboard(FALSE), @@ -481,7 +482,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 ); mBtnPasteMenu->setEnabled( single_volume && enable_modify ); LLUUID owner_id; |