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
7698e169
Commit
7698e169
authored
11 years ago
by
Mnikolenko ProductEngine
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselection
parent
6bbb8681
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/llfloaterimcontainer.cpp
+20
-0
20 additions, 0 deletions
indra/newview/llfloaterimcontainer.cpp
indra/newview/skins/default/xui/en/menu_conversation.xml
+1
-0
1 addition, 0 deletions
indra/newview/skins/default/xui/en/menu_conversation.xml
with
21 additions
and
0 deletions
indra/newview/llfloaterimcontainer.cpp
+
20
−
0
View file @
7698e169
...
@@ -1271,6 +1271,22 @@ bool LLFloaterIMContainer::enableContextMenuItem(const LLSD& userdata)
...
@@ -1271,6 +1271,22 @@ bool LLFloaterIMContainer::enableContextMenuItem(const LLSD& userdata)
uuid_vec_t
uuids
;
uuid_vec_t
uuids
;
getParticipantUUIDs
(
uuids
);
getParticipantUUIDs
(
uuids
);
//If there is group or ad-hoc chat in multiselection, everything needs to be disabled
if
(
uuids
.
size
()
>
1
)
{
const
std
::
set
<
LLFolderViewItem
*>
selectedItems
=
mConversationsRoot
->
getSelectionList
();
LLConversationItem
*
conversationItem
;
for
(
std
::
set
<
LLFolderViewItem
*>::
const_iterator
it
=
selectedItems
.
begin
();
it
!=
selectedItems
.
end
();
++
it
)
{
conversationItem
=
static_cast
<
LLConversationItem
*>
((
*
it
)
->
getViewModelItem
());
if
((
conversationItem
->
getType
()
==
LLConversationItem
::
CONV_SESSION_GROUP
)
||
(
conversationItem
->
getType
()
==
LLConversationItem
::
CONV_SESSION_AD_HOC
))
{
return
false
;
}
}
}
if
(
"conversation_log"
==
item
)
if
(
"conversation_log"
==
item
)
{
{
return
gSavedPerAccountSettings
.
getS32
(
"KeepConversationLogTranscripts"
)
>
0
;
return
gSavedPerAccountSettings
.
getS32
(
"KeepConversationLogTranscripts"
)
>
0
;
...
@@ -1375,6 +1391,10 @@ bool LLFloaterIMContainer::enableContextMenuItem(const std::string& item, uuid_v
...
@@ -1375,6 +1391,10 @@ bool LLFloaterIMContainer::enableContextMenuItem(const std::string& item, uuid_v
else
if
(
"can_call"
==
item
)
else
if
(
"can_call"
==
item
)
{
{
return
LLAvatarActions
::
canCall
();
return
LLAvatarActions
::
canCall
();
}
else
if
(
"can_open_voice_conversation"
==
item
)
{
return
is_single_select
&&
LLAvatarActions
::
canCall
();
}
}
else
if
(
"can_zoom_in"
==
item
)
else
if
(
"can_zoom_in"
==
item
)
{
{
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/menu_conversation.xml
+
1
−
0
View file @
7698e169
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
layout=
"topleft"
layout=
"topleft"
name=
"open_voice_conversation"
>
name=
"open_voice_conversation"
>
<on_click
function=
"Avatar.DoToSelected"
parameter=
"open_voice_conversation"
/>
<on_click
function=
"Avatar.DoToSelected"
parameter=
"open_voice_conversation"
/>
<on_enable
function=
"Avatar.EnableItem"
parameter=
"can_open_voice_conversation"
/>
</menu_item_call>
</menu_item_call>
<menu_item_call
<menu_item_call
label=
"Disconnect from voice"
label=
"Disconnect from voice"
...
...
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