diff options
Diffstat (limited to 'linden/indra/newview/llfloatertools.cpp')
-rw-r--r-- | linden/indra/newview/llfloatertools.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp index 3931acb..3748131 100644 --- a/linden/indra/newview/llfloatertools.cpp +++ b/linden/indra/newview/llfloatertools.cpp | |||
@@ -216,7 +216,7 @@ BOOL LLFloaterTools::postBuild() | |||
216 | mRadioSelectFace = LLUICtrlFactory::getCheckBoxByName(this,"radio select face"); | 216 | mRadioSelectFace = LLUICtrlFactory::getCheckBoxByName(this,"radio select face"); |
217 | childSetCommitCallback("radio select face",commit_select_tool,gToolFace); | 217 | childSetCommitCallback("radio select face",commit_select_tool,gToolFace); |
218 | mCheckSelectIndividual = LLUICtrlFactory::getCheckBoxByName(this,"checkbox edit linked parts"); | 218 | mCheckSelectIndividual = LLUICtrlFactory::getCheckBoxByName(this,"checkbox edit linked parts"); |
219 | childSetValue("checkbox edit linked parts",(BOOL)!gSavedSettings.getBOOL("SelectLinkedSet")); | 219 | childSetValue("checkbox edit linked parts",(BOOL)gSavedSettings.getBOOL("EditLinkedParts")); |
220 | childSetCommitCallback("checkbox edit linked parts",commit_select_component,this); | 220 | childSetCommitCallback("checkbox edit linked parts",commit_select_component,this); |
221 | mCheckSnapToGrid = LLUICtrlFactory::getCheckBoxByName(this,"checkbox snap to grid"); | 221 | mCheckSnapToGrid = LLUICtrlFactory::getCheckBoxByName(this,"checkbox snap to grid"); |
222 | childSetValue("checkbox snap to grid",(BOOL)gSavedSettings.getBOOL("SnapEnabled")); | 222 | childSetValue("checkbox snap to grid",(BOOL)gSavedSettings.getBOOL("SnapEnabled")); |
@@ -456,7 +456,7 @@ void LLFloaterTools::draw() | |||
456 | mDirty = FALSE; | 456 | mDirty = FALSE; |
457 | } | 457 | } |
458 | 458 | ||
459 | mCheckSelectIndividual->set(!gSavedSettings.getBOOL("SelectLinkedSet")); | 459 | // mCheckSelectIndividual->set(gSavedSettings.getBOOL("EditLinkedParts")); |
460 | LLFloater::draw(); | 460 | LLFloater::draw(); |
461 | } | 461 | } |
462 | 462 | ||
@@ -567,7 +567,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask) | |||
567 | if (mCheckSelectIndividual) | 567 | if (mCheckSelectIndividual) |
568 | { | 568 | { |
569 | mCheckSelectIndividual->setVisible(edit_visible); | 569 | mCheckSelectIndividual->setVisible(edit_visible); |
570 | mCheckSelectIndividual->set(!gSavedSettings.getBOOL("SelectLinkedSet")); | 570 | //mCheckSelectIndividual->set(gSavedSettings.getBOOL("EditLinkedParts")); |
571 | } | 571 | } |
572 | 572 | ||
573 | mRadioPosition ->set( tool == gToolTranslate ); | 573 | mRadioPosition ->set( tool == gToolTranslate ); |
@@ -746,7 +746,7 @@ void LLFloaterTools::onClose(bool app_quitting) | |||
746 | 746 | ||
747 | // exit component selection mode | 747 | // exit component selection mode |
748 | gSelectMgr->promoteSelectionToRoot(); | 748 | gSelectMgr->promoteSelectionToRoot(); |
749 | gSavedSettings.setBOOL("SelectLinkedSet", TRUE); | 749 | gSavedSettings.setBOOL("EditLinkedParts", FALSE); |
750 | 750 | ||
751 | gViewerWindow->showCursor(); | 751 | gViewerWindow->showCursor(); |
752 | 752 | ||
@@ -922,7 +922,7 @@ void commit_select_component(LLUICtrl *ctrl, void *data) | |||
922 | } | 922 | } |
923 | 923 | ||
924 | BOOL select_individuals = floaterp->mCheckSelectIndividual->get(); | 924 | BOOL select_individuals = floaterp->mCheckSelectIndividual->get(); |
925 | gSavedSettings.setBOOL("SelectLinkedSet", !select_individuals); | 925 | gSavedSettings.setBOOL("EditLinkedParts", select_individuals); |
926 | floaterp->dirty(); | 926 | floaterp->dirty(); |
927 | 927 | ||
928 | if (select_individuals) | 928 | if (select_individuals) |