diff options
| author | angela <angela@lindenlab.com> | 2010-02-11 23:34:20 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-11 23:34:20 +0800 |
| commit | f078c53da8ee11b7bb383c0974875b5ff4a15c6a (patch) | |
| tree | f8fd975ace547f1e3c194cfa3446f1ef35b2d12b /indra/newview/llfloatertools.cpp | |
| parent | 3684b437a0e1c4c8be6d05e3a5f131265b8f1a39 (diff) | |
| parent | 5e12a2cb697ad1d82a472cc35fc3570209e5ec0e (diff) | |
merge with remote repo
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 4edd09b02c..e2b083a29b 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -666,8 +666,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask) if (mCheckCopyCenters) mCheckCopyCenters ->setVisible( create_visible ); if (mCheckCopyRotates) mCheckCopyRotates ->setVisible( create_visible ); - if (mCheckCopyCenters) mCheckCopyCenters->setEnabled( mCheckCopySelection->get() ); - if (mCheckCopyRotates) mCheckCopyRotates->setEnabled( mCheckCopySelection->get() ); + if (mCheckCopyCenters && mCheckCopySelection) mCheckCopyCenters->setEnabled( mCheckCopySelection->get() ); + if (mCheckCopyRotates && mCheckCopySelection) mCheckCopyRotates->setEnabled( mCheckCopySelection->get() ); // Land buttons BOOL land_visible = (tool == LLToolBrushLand::getInstance() || tool == LLToolSelectLand::getInstance() ); |