Detachment by replacing outfit can be prevented

Part of the @detach=<y/n> command implementation.

1 files changed, 1 insertions, 1 deletions

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index cd4222dddf..5211884bc2 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1304,7 +1304,7 @@ void LLAgentWearables::findAttachmentsAddRemoveInfo(LLInventoryModel::item_array
                 LLUUID object_item_id = objectp->getAttachmentItemID();
 
                 bool remove_attachment = true;
-                if (requested_item_ids.find(object_item_id) != requested_item_ids.end())
+                if (requested_item_ids.find(object_item_id) != requested_item_ids.end() || objectp->isLocked())
                 {   // Object currently worn, was requested to keep it
                     // Flag as currently worn so we won't have to add it again.
                     remove_attachment = false;