Fix FSSelectCopyableOnly and FSSelectLockedOnly so you can still click the object outside of build/edit mode

master
Hecklezz 2025-05-18 23:08:07 +10:00
parent 716e7dbf63
commit b1b0a017de
1 changed files with 13 additions and 12 deletions

View File

@ -7969,19 +7969,20 @@ bool LLSelectMgr::canSelectObject(LLViewerObject* object, bool ignore_select_own
// only select my own objects
return false;
}
// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
if (!object->permCopy() && gSavedSettings.getBOOL("FSSelectCopyableOnly"))
{
return false;
}
// </FS:Ansariel>
// <FS:Ansariel> FIRE-17696: Option to select only locked objects
if (gSavedSettings.getBOOL("FSSelectLockedOnly") && object->permMove() && !object->isPermanentEnforced())
{
return false;
}
// </FS:Ansariel>// Can't select objects that are not owned by you or group
}
// <FS:Ansariel> FIRE-14593: Option to select only copyable objects
if (!object->permCopy() && gSavedSettings.getBOOL("FSSelectCopyableOnly"))
{
return false;
}
// </FS:Ansariel>
// <FS:Ansariel> FIRE-17696: Option to select only locked objects
if (gSavedSettings.getBOOL("FSSelectLockedOnly") && object->permMove() && !object->isPermanentEnforced())
{
return false;
}
// </FS:Ansariel>
// Can't select orphans
if (object->isOrphaned()) return false;