merge -r 59028:59178 maintenance -> release.

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index 8a6fdfd0ad..e19604c9f0 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -364,6 +364,12 @@ struct SetItemOwnerAndGroup
 		LLPermissions perm = item->getPermissions();
 		bool is_atomic = (LLAssetType::AT_OBJECT == item->getType()) ? false : true;
 		perm.setOwnerAndGroup(mAuthorityID, mOwnerID, mGroupID, is_atomic);
+		// If no owner id is set, this is equivalent to a deed action.
+		// Clear 'share with group'.
+		if (mOwnerID.isNull())
+		{
+			perm.setMaskGroup(PERM_NONE);
+		}
 		item->setPermissions(perm);
 	}
 };