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
b0950991
Commit
b0950991
authored
7 years ago
by
maxim_productengine
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-8274 FIXED Temporary attachments could not be detached via gear menu from Appearance>Wearing
parent
3e56de13
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llpanelwearing.cpp
+24
-9
24 additions, 9 deletions
indra/newview/llpanelwearing.cpp
indra/newview/llpanelwearing.h
+1
-0
1 addition, 0 deletions
indra/newview/llpanelwearing.h
with
25 additions
and
9 deletions
indra/newview/llpanelwearing.cpp
+
24
−
9
View file @
b0950991
...
...
@@ -65,7 +65,7 @@ class LLWearingGearMenu
LLUICtrl
::
EnableCallbackRegistry
::
ScopedRegistrar
enable_registrar
;
registrar
.
add
(
"Gear.Edit"
,
boost
::
bind
(
&
edit_outfit
));
registrar
.
add
(
"Gear.TakeOff"
,
boost
::
bind
(
&
LLWearing
GearMenu
::
onTakeOff
,
this
));
registrar
.
add
(
"Gear.TakeOff"
,
boost
::
bind
(
&
LL
Panel
Wearing
::
onRemoveItem
,
mPanelWearing
));
registrar
.
add
(
"Gear.Copy"
,
boost
::
bind
(
&
LLPanelWearing
::
copyToClipboard
,
mPanelWearing
));
enable_registrar
.
add
(
"Gear.OnEnable"
,
boost
::
bind
(
&
LLPanelWearing
::
isActionEnabled
,
mPanelWearing
,
_2
));
...
...
@@ -79,13 +79,6 @@ class LLWearingGearMenu
private
:
void
onTakeOff
()
{
uuid_vec_t
selected_uuids
;
mPanelWearing
->
getSelectedItemsUUIDs
(
selected_uuids
);
LLAppearanceMgr
::
instance
().
removeItemsFromAvatar
(
selected_uuids
);
}
LLToggleableMenu
*
mMenu
;
LLPanelWearing
*
mPanelWearing
;
};
...
...
@@ -343,7 +336,14 @@ bool LLPanelWearing::isActionEnabled(const LLSD& userdata)
if
(
command_name
==
"take_off"
)
{
return
hasItemSelected
()
&&
canTakeOffSelected
();
if
(
mWearablesTab
->
isExpanded
())
{
return
hasItemSelected
()
&&
canTakeOffSelected
();
}
else
{
return
mTempItemsList
->
hasSelectedItem
();
}
}
return
false
;
...
...
@@ -532,6 +532,21 @@ void LLPanelWearing::onRemoveAttachment()
}
}
void
LLPanelWearing
::
onRemoveItem
()
{
if
(
mWearablesTab
->
isExpanded
())
{
uuid_vec_t
selected_uuids
;
getSelectedItemsUUIDs
(
selected_uuids
);
LLAppearanceMgr
::
instance
().
removeItemsFromAvatar
(
selected_uuids
);
}
else
{
onRemoveAttachment
();
}
}
void
LLPanelWearing
::
copyToClipboard
()
{
std
::
string
text
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llpanelwearing.h
+
1
−
0
View file @
b0950991
...
...
@@ -80,6 +80,7 @@ class LLPanelWearing : public LLPanelAppearanceTab
void
onAccordionTabStateChanged
();
void
setAttachmentDetails
(
LLSD
content
);
void
requestAttachmentDetails
();
void
onRemoveItem
();
void
onEditAttachment
();
void
onRemoveAttachment
();
...
...
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