[FIXED] FIRE-34232: 'Detach' on the wearing context menu for temporary attachments bypasses attachment locks

master
Kitty Barnett 2025-06-01 01:20:22 +02:00
parent ef766a92e3
commit d44b21065d
1 changed files with 13 additions and 0 deletions

View File

@ -102,6 +102,7 @@
// [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1a)
#include "rlvactions.h"
#include "rlvhandler.h"
#include "rlvlocks.h"
#include "rlvmodifiers.h"
// [/RLVa:KB]
// <FS:CR> Aurora Sim
@ -5278,6 +5279,18 @@ void LLSelectMgr::sendDetach()
return;
}
// [RLVa:KB]
if ( (rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.hasLockedAttachmentPoint(RLV_LOCK_REMOVE)) )
{
LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
RlvSelectHasLockedAttach f;
if ( (hSelect->isAttachment()) && (hSelect->getFirstRootNode(&f, false) != NULL) )
{
return;
}
}
// [/RLVa:KB]
sendListToRegions(
"ObjectDetach",
packAgentAndSessionID,