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
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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 Archive
Alchemy Viewer
Commits
ea10cffd
Commit
ea10cffd
authored
5 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
More inventory link stuff
parent
7eb97e26
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llinventorybridge.cpp
+9
-0
9 additions, 0 deletions
indra/newview/llinventorybridge.cpp
with
9 additions
and
0 deletions
indra/newview/llinventorybridge.cpp
+
9
−
0
View file @
ea10cffd
...
@@ -4155,6 +4155,12 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
...
@@ -4155,6 +4155,12 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
{
{
disabled_items
.
push_back
(
std
::
string
(
"Delete"
));
disabled_items
.
push_back
(
std
::
string
(
"Delete"
));
}
}
items
.
push_back
(
std
::
string
(
"Paste As Link"
));
if
(
!
isClipboardPasteableAsLink
()
||
(
flags
&
FIRST_SELECTED_ITEM
)
==
0
)
{
disabled_items
.
push_back
(
std
::
string
(
"Paste As Link"
));
}
}
}
}
}
...
@@ -4762,6 +4768,9 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
...
@@ -4762,6 +4768,9 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
// Returns true if the item can be moved to Current Outfit or any outfit folder.
// Returns true if the item can be moved to Current Outfit or any outfit folder.
static
BOOL
can_move_to_outfit
(
LLInventoryItem
*
inv_item
,
BOOL
move_is_into_current_outfit
)
static
BOOL
can_move_to_outfit
(
LLInventoryItem
*
inv_item
,
BOOL
move_is_into_current_outfit
)
{
{
if
(
!
inv_item
)
return
FALSE
;
LLInventoryType
::
EType
inv_type
=
inv_item
->
getInventoryType
();
LLInventoryType
::
EType
inv_type
=
inv_item
->
getInventoryType
();
if
((
inv_type
!=
LLInventoryType
::
IT_WEARABLE
)
&&
if
((
inv_type
!=
LLInventoryType
::
IT_WEARABLE
)
&&
(
inv_type
!=
LLInventoryType
::
IT_GESTURE
)
&&
(
inv_type
!=
LLInventoryType
::
IT_GESTURE
)
&&
...
...
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