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
b172ced5
Commit
b172ced5
authored
6 years ago
by
maxim_productengine
Browse files
Options
Downloads
Patches
Plain Diff
SL-10927 FIXED [EEP] Unable to share environment settings from My Environments floater
parent
f9c0b021
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llavataractions.cpp
+15
-12
15 additions, 12 deletions
indra/newview/llavataractions.cpp
indra/newview/llavataractions.h
+1
-1
1 addition, 1 deletion
indra/newview/llavataractions.h
with
16 additions
and
13 deletions
indra/newview/llavataractions.cpp
+
15
−
12
View file @
b172ced5
...
...
@@ -626,10 +626,10 @@ namespace action_give_inventory
* Checks My Inventory visibility.
*/
static
bool
is_give_inventory_acceptable
()
static
bool
is_give_inventory_acceptable
(
LLInventoryPanel
*
panel
=
NULL
)
{
// check selection in the panel
const
std
::
set
<
LLUUID
>
inventory_selected_uuids
=
LLAvatarActions
::
getInventorySelectedUUIDs
();
const
std
::
set
<
LLUUID
>
inventory_selected_uuids
=
LLAvatarActions
::
getInventorySelectedUUIDs
(
panel
);
if
(
inventory_selected_uuids
.
empty
())
return
false
;
// nothing selected
bool
acceptable
=
false
;
...
...
@@ -694,7 +694,7 @@ namespace action_give_inventory
uuid_vec_t
mAvatarUuids
;
};
static
void
give_inventory_cb
(
const
LLSD
&
notification
,
const
LLSD
&
response
)
static
void
give_inventory_cb
(
const
LLSD
&
notification
,
const
LLSD
&
response
,
std
::
set
<
LLUUID
>
inventory_selected_uuids
)
{
S32
option
=
LLNotificationsUtil
::
getSelectedOption
(
notification
,
response
);
// if Cancel pressed
...
...
@@ -703,7 +703,6 @@ namespace action_give_inventory
return
;
}
const
std
::
set
<
LLUUID
>
inventory_selected_uuids
=
LLAvatarActions
::
getInventorySelectedUUIDs
();
if
(
inventory_selected_uuids
.
empty
())
{
return
;
...
...
@@ -786,11 +785,11 @@ namespace action_give_inventory
* @param avatar_names - avatar names request to be sent.
* @param avatar_uuids - avatar names request to be sent.
*/
static
void
give_inventory
(
const
uuid_vec_t
&
avatar_uuids
,
const
std
::
vector
<
LLAvatarName
>
avatar_names
)
static
void
give_inventory
(
const
uuid_vec_t
&
avatar_uuids
,
const
std
::
vector
<
LLAvatarName
>
avatar_names
,
LLInventoryPanel
*
panel
=
NULL
)
{
llassert
(
avatar_names
.
size
()
==
avatar_uuids
.
size
());
const
std
::
set
<
LLUUID
>
inventory_selected_uuids
=
LLAvatarActions
::
getInventorySelectedUUIDs
();
const
std
::
set
<
LLUUID
>
inventory_selected_uuids
=
LLAvatarActions
::
getInventorySelectedUUIDs
(
panel
);
if
(
inventory_selected_uuids
.
empty
())
{
return
;
...
...
@@ -824,7 +823,7 @@ namespace action_give_inventory
substitutions
[
"ITEMS"
]
=
items
;
LLShareInfo
::
instance
().
mAvatarNames
=
avatar_names
;
LLShareInfo
::
instance
().
mAvatarUuids
=
avatar_uuids
;
LLNotificationsUtil
::
add
(
notification
,
substitutions
,
LLSD
(),
&
give_inventory_cb
);
LLNotificationsUtil
::
add
(
notification
,
substitutions
,
LLSD
(),
boost
::
bind
(
&
give_inventory_cb
,
_1
,
_2
,
inventory_selected_uuids
)
);
}
}
...
...
@@ -877,11 +876,14 @@ void LLAvatarActions::buildResidentsString(const uuid_vec_t& avatar_uuids, std::
}
//static
std
::
set
<
LLUUID
>
LLAvatarActions
::
getInventorySelectedUUIDs
()
std
::
set
<
LLUUID
>
LLAvatarActions
::
getInventorySelectedUUIDs
(
LLInventoryPanel
*
active_panel
)
{
std
::
set
<
LLFolderViewItem
*>
inventory_selected
;
LLInventoryPanel
*
active_panel
=
action_give_inventory
::
get_active_inventory_panel
();
if
(
!
active_panel
)
{
active_panel
=
action_give_inventory
::
get_active_inventory_panel
();
}
if
(
active_panel
)
{
inventory_selected
=
active_panel
->
getRootFolder
()
->
getSelectionList
();
...
...
@@ -911,15 +913,16 @@ void LLAvatarActions::shareWithAvatars(LLView * panel)
{
using
namespace
action_give_inventory
;
LLFloater
*
root_floater
=
gFloaterView
->
getParentFloater
(
panel
);
LLFloater
*
root_floater
=
gFloaterView
->
getParentFloater
(
panel
);
LLInventoryPanel
*
inv_panel
=
dynamic_cast
<
LLInventoryPanel
*>
(
panel
);
LLFloaterAvatarPicker
*
picker
=
LLFloaterAvatarPicker
::
show
(
boost
::
bind
(
give_inventory
,
_1
,
_2
),
TRUE
,
FALSE
,
FALSE
,
root_floater
->
getName
());
LLFloaterAvatarPicker
::
show
(
boost
::
bind
(
give_inventory
,
_1
,
_2
,
inv_panel
),
TRUE
,
FALSE
,
FALSE
,
root_floater
->
getName
());
if
(
!
picker
)
{
return
;
}
picker
->
setOkBtnEnableCb
(
boost
::
bind
(
is_give_inventory_acceptable
));
picker
->
setOkBtnEnableCb
(
boost
::
bind
(
is_give_inventory_acceptable
,
inv_panel
));
picker
->
openFriendsTab
();
if
(
root_floater
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llavataractions.h
+
1
−
1
View file @
b172ced5
...
...
@@ -244,7 +244,7 @@ class LLAvatarActions
*/
static
void
viewChatHistory
(
const
LLUUID
&
id
);
static
std
::
set
<
LLUUID
>
getInventorySelectedUUIDs
();
static
std
::
set
<
LLUUID
>
getInventorySelectedUUIDs
(
LLInventoryPanel
*
active_panel
=
NULL
);
private:
static
bool
callbackAddFriendWithMessage
(
const
LLSD
&
notification
,
const
LLSD
&
response
);
...
...
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