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

Merge pull request #128 from Hecklezz/fix/select_object_options 

[FIRE-34257] Fix mousing over and clicking objects with FSSelectCopyableOnly or FSSelectLockedOnly enabled
master
Beq Janus 2025-05-23 10:32:35 +01:00 committed by GitHub
parent 29a97d83c3 b1b0a017de
commit e51e326e82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llselectmgr.cpp
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;