summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobject.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
-rw-r--r--indra/newview/llpanelobject.cpp3
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;