diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-03 21:21:58 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-03 21:21:58 +0800 |
| commit | d32b1c090f396824c5ec2ffbc40b174a55bdbe0b (patch) | |
| tree | bdf6f1753b8ec7b37aa0831e6ff0beeffcefd869 /indra/newview/llviewermenu.cpp | |
| parent | b024b356c75528b4d2688016d49a11e1270fb48d (diff) | |
| parent | 2283c5c35103dd99b35ca43a09bf8e11e6cd7957 (diff) | |
Merge branch 'main' into gltf_mesh_import
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 63527d8594..c3bb8ef4c4 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4506,7 +4506,7 @@ void handle_object_sit(LLViewerObject* object, const LLVector3& offset) { // get object selection offset - if (object && object->getPCode() == LL_PCODE_VOLUME) + if (gAgent.isAllowedToSit() && object && object->getPCode() == LL_PCODE_VOLUME) { gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit); @@ -7700,6 +7700,7 @@ bool enable_detach(const LLSD&) // Only enable detach if all faces of object are selected if (!object || !object->isAttachment() || + object->isLocked() || !LLSelectMgr::getInstance()->getSelection()->contains(object,SELECT_ALL_TES )) { return false; |