Second Life viewer sources 1.14.0.0

1 files changed, 7 insertions, 0 deletions

diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h
index 1ebcabf..fc135de 100644
--- a/linden/indra/llinventory/llinventory.h
+++ b/linden/indra/llinventory/llinventory.h
@@ -32,6 +32,7 @@
 
 #include "llassetstorage.h"
 #include "lldarray.h"
+#include "llmemtype.h"
 #include "llpermissions.h"
 #include "llsaleinfo.h"
 #include "llsd.h"
@@ -382,6 +383,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);
         }
 };