livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-12688 Restored stricter permission requirements 

You need to own texture in inventory to be able to copy it
meow-7.2.2
Andrey Kleshchev 2020-06-25 23:34:22 +03:00
parent 8e8c403853
commit 46b037aabd
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llpanelface.cpp
View File

@ -2870,7 +2870,7 @@ void LLPanelFace::onCopyTexture()
LLUUID item_id;
LLUUID id = te_data["te"]["imageid"].asUUID();
bool from_library = get_is_predefined_texture(id);
bool full_perm = from_library || (objectp->permCopy() && objectp->permTransfer() && objectp->permModify());
bool full_perm = from_library;
if (id.notNull() && !full_perm)
{
@ -2911,8 +2911,6 @@ void LLPanelFace::onCopyTexture()
else
{
te_data["te"]["itemfullperm"] = full_perm;
// from_library is unreliable since we don't get texture item if source object
// is fullperm but it merely means additional checks when assigning texture
te_data["te"]["fromlibrary"] = from_library;
// If full permission object, texture is free to copy,
@ -2921,7 +2919,7 @@ void LLPanelFace::onCopyTexture()
// Normally we care only about restrictions for current user and objects
// don't inherit any 'next owner' permissions from texture, so there is
// no need to record item id if full_perm==true
if (!full_perm && item_id.notNull())
if (!full_perm && !from_library && item_id.notNull())
{
LLViewerInventoryItem* itemp = gInventory.getItem(item_id);
if (itemp)
@ -3193,8 +3191,6 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
if (itemp_res)
{
// from_library is unreliable since we don't get texture item if object is
// fullperm but it merely means additional checks when assigning texture
if (te == -1) // all faces
{
LLToolDragAndDrop::dropTextureAllFaces(objectp,