livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- internal : remove hack for legacy viewers without multi-attachment support 

--HG--
branch : RLVa
Kitty Barnett 2014-02-28 12:07:13 +01:00
parent d9cf89781e
commit 71af2b6afa
1 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/rlvlocks.cpp
View File

@ -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;
}
}
}
}
}