From 274d73ede02a0e4d301c753aed9afafb06aea708 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 21 Jun 2015 17:39:23 +0200 Subject: [PATCH] Comment out LL object unlink as it's buggy (BUG-9499) and doesn't work properly. Simply always show the confirmation like we did before --- indra/newview/llselectmgr.cpp | 37 +++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 633bd11b92..2eba013c49 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -653,25 +653,28 @@ bool LLSelectMgr::linkObjects() bool LLSelectMgr::unlinkObjects() { - LLViewerObject *object = mSelectedObjects->getFirstRootObject(); - if (!object) return false; + // Comment this out as it's buggy (BUG-9499) and doesn't work properly. Simply always show the confirmation like we did before + //LLViewerObject *object = mSelectedObjects->getFirstRootObject(); + //if (!object) return false; - S32 min_objects_for_confirm = gSavedSettings.getS32("MinObjectsForUnlinkConfirm"); - for (LLObjectSelection::root_iterator iter = getSelection()->root_begin(); iter != getSelection()->root_end(); iter++) - { - object = (*iter)->getObject(); - if(object) - { - S32 objects_in_linkset = object->numChildren() + 1; - if(objects_in_linkset >= min_objects_for_confirm) - { - LLNotificationsUtil::add("ConfirmUnlink", LLSD(), LLSD(), boost::bind(&LLSelectMgr::confirmUnlinkObjects, this, _1, _2)); - return true; - } - } - } + //S32 min_objects_for_confirm = gSavedSettings.getS32("MinObjectsForUnlinkConfirm"); + //for (LLObjectSelection::root_iterator iter = getSelection()->root_begin(); iter != getSelection()->root_end(); iter++) + //{ + // object = (*iter)->getObject(); + // if(object) + // { + // S32 objects_in_linkset = object->numChildren() + 1; + // if(objects_in_linkset >= min_objects_for_confirm) + // { + // LLNotificationsUtil::add("ConfirmUnlink", LLSD(), LLSD(), boost::bind(&LLSelectMgr::confirmUnlinkObjects, this, _1, _2)); + // return true; + // } + // } + //} - LLSelectMgr::getInstance()->sendDelink(); + //LLSelectMgr::getInstance()->sendDelink(); + LLNotificationsUtil::add("ConfirmUnlink", LLSD(), LLSD(), boost::bind(&LLSelectMgr::confirmUnlinkObjects, this, _1, _2)); + // return true; }