summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-10-17 15:47:17 +0000
committerRider Linden <rider@lindenlab.com>2018-10-17 15:47:17 +0000
commitf192ecf44b3664a2782d11a10fcb8edbab8a9a92 (patch)
tree40c2b2d7403b0c97b0a15887339e02bb311ec109
parent866f9ab17a893f2c10d2a4ee1797c7afb2eb12ce (diff)
parenta639642c218161901515d74852c5b61961ce3032 (diff)
Merged in maxim_productengine/viewer-eep (pull request #152)
SL-9853 FIXED [EEP] Default Settings object cannot be copied by other users.
-rw-r--r--indra/newview/llsettingsvo.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 8e55ae395a..1f62b98889 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -158,6 +158,14 @@ void LLSettingsVOBase::onInventoryItemCreated(const LLUUID &inventoryId, LLSetti
if (pitem)
{
asset_id = pitem->getAssetUUID();
+
+ LLPermissions perm = pitem->getPermissions();
+ if (perm.getMaskEveryone() != PERM_COPY)
+ {
+ perm.setMaskEveryone(PERM_COPY);
+ pitem->setPermissions(perm);
+ pitem->updateServer(FALSE);
+ }
}
if (callback)
callback(asset_id, inventoryId, LLUUID::null, LLSD());