From 71af2b6afa0443d59b5c315427d5ebc88c19286d Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Fri, 28 Feb 2014 12:07:13 +0100 Subject: [PATCH] - internal : remove hack for legacy viewers without multi-attachment support --HG-- branch : RLVa --- indra/newview/rlvlocks.cpp | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp index de8140a51b..5493cc2647 100644 --- a/indra/newview/rlvlocks.cpp +++ b/indra/newview/rlvlocks.cpp @@ -503,25 +503,6 @@ void RlvAttachmentLockWatchdog::detach(const LLViewerObject* pAttachObj) m_PendingDetach.push_back(pAttachObj->getAttachmentItemID()); gMessageSystem->sendReliable(gAgent.getRegionHost() ); - - // HACK-RLVa: force the region to send out an ObjectUpdate for the old attachment so obsolete viewers will remember it exists - S32 idxAttachPt = RlvAttachPtLookup::getAttachPointIndex(pAttachObj); - const LLViewerJointAttachment* pAttachPt = - (isAgentAvatarValid()) ? get_if_there(gAgentAvatarp->mAttachmentPoints, (S32)idxAttachPt, (LLViewerJointAttachment*)NULL) : NULL; - if ( (pAttachPt) && (!pAttachPt->getIsHUDAttachment()) && (pAttachPt->mAttachedObjects.size() > 1) ) - { - for (LLViewerJointAttachment::attachedobjs_vec_t::const_iterator itAttachObj = pAttachPt->mAttachedObjects.begin(); - itAttachObj != pAttachPt->mAttachedObjects.end(); ++itAttachObj) - { - if (pAttachObj != *itAttachObj) - { - LLSelectMgr::instance().deselectAll(); - LLSelectMgr::instance().selectObjectAndFamily(*itAttachObj); - LLSelectMgr::instance().deselectAll(); - break; - } - } - } } } @@ -558,22 +539,6 @@ void RlvAttachmentLockWatchdog::detach(S32 idxAttachPt, const uuid_vec_t& idsAtt } gMessageSystem->sendReliable(gAgent.getRegionHost()); - - // HACK-RLVa: force the region to send out an ObjectUpdate for the old attachment so obsolete viewers will remember it exists - if ( (!pAttachPt->getIsHUDAttachment()) && (pAttachPt->mAttachedObjects.size() > attachObjs.size()) ) - { - for (LLViewerJointAttachment::attachedobjs_vec_t::const_iterator itAttachObj = pAttachPt->mAttachedObjects.begin(); - itAttachObj != pAttachPt->mAttachedObjects.end(); ++itAttachObj) - { - if (std::find(attachObjs.begin(), attachObjs.end(), *itAttachObj) == attachObjs.end()) - { - LLSelectMgr::instance().deselectAll(); - LLSelectMgr::instance().selectObjectAndFamily(*itAttachObj); - LLSelectMgr::instance().deselectAll(); - break; - } - } - } } }