Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
baf86263
Commit
baf86263
authored
5 years ago
by
andreykproductengine
Browse files
Options
Downloads
Patches
Plain Diff
SL-12213 Unable to paste no-modify/no-transfer texture
parent
448eff83
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!83
Merge Linden 6.6.7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llpanelobject.cpp
+10
-4
10 additions, 4 deletions
indra/newview/llpanelobject.cpp
with
10 additions
and
4 deletions
indra/newview/llpanelobject.cpp
+
10
−
4
View file @
baf86263
...
@@ -2449,7 +2449,7 @@ bool LLPanelObject::canCopyTexture(LLUUID image_id)
...
@@ -2449,7 +2449,7 @@ bool LLPanelObject::canCopyTexture(LLUUID image_id)
{
{
// User is allowed to copy a texture if:
// User is allowed to copy a texture if:
// library asset or default texture,
// library asset or default texture,
// or
full
perm asset exists in user's inventory
// or
copy
perm asset exists in user's inventory
// Library asset or default texture
// Library asset or default texture
if
(
gInventory
.
isObjectDescendentOf
(
image_id
,
gInventory
.
getLibraryRootFolderID
())
if
(
gInventory
.
isObjectDescendentOf
(
image_id
,
gInventory
.
getLibraryRootFolderID
())
...
@@ -2461,7 +2461,7 @@ bool LLPanelObject::canCopyTexture(LLUUID image_id)
...
@@ -2461,7 +2461,7 @@ bool LLPanelObject::canCopyTexture(LLUUID image_id)
return
true
;
return
true
;
}
}
// Search for a
full
perm asset
// Search for a
copy
perm asset
LLViewerInventoryCategory
::
cat_array_t
cats
;
LLViewerInventoryCategory
::
cat_array_t
cats
;
LLViewerInventoryItem
::
item_array_t
items
;
LLViewerInventoryItem
::
item_array_t
items
;
LLAssetIDMatches
asset_id_matches
(
image_id
);
LLAssetIDMatches
asset_id_matches
(
image_id
);
...
@@ -2475,12 +2475,18 @@ bool LLPanelObject::canCopyTexture(LLUUID image_id)
...
@@ -2475,12 +2475,18 @@ bool LLPanelObject::canCopyTexture(LLUUID image_id)
for
(
S32
i
=
0
;
i
<
items
.
size
();
i
++
)
for
(
S32
i
=
0
;
i
<
items
.
size
();
i
++
)
{
{
LLViewerInventoryItem
*
itemp
=
items
[
i
];
LLViewerInventoryItem
*
itemp
=
items
[
i
];
if
(
itemp
->
getIsFullPerm
())
if
(
itemp
)
{
LLPermissions
item_permissions
=
itemp
->
getPermissions
();
if
(
item_permissions
.
allowOperationBy
(
PERM_COPY
,
gAgent
.
getID
(),
gAgent
.
getGroupID
()))
{
{
return
true
;
return
true
;
}
}
}
}
}
}
}
return
false
;
return
false
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment