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
bce1630e
Commit
bce1630e
authored
6 years ago
by
maxim_productengine
Browse files
Options
Downloads
Patches
Plain Diff
SL-10780 FIXED Speaker icon is shown for all friends
parent
ec9a70de
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/newview/llavatarlistitem.cpp
+1
-0
1 addition, 0 deletions
indra/newview/llavatarlistitem.cpp
indra/newview/lloutputmonitorctrl.cpp
+10
-5
10 additions, 5 deletions
indra/newview/lloutputmonitorctrl.cpp
indra/newview/lloutputmonitorctrl.h
+10
-1
10 additions, 1 deletion
indra/newview/lloutputmonitorctrl.h
with
21 additions
and
6 deletions
indra/newview/llavatarlistitem.cpp
+
1
−
0
View file @
bce1630e
...
...
@@ -119,6 +119,7 @@ BOOL LLAvatarListItem::postBuild()
mIconPermissionEditTheirs
->
setVisible
(
false
);
mSpeakingIndicator
=
getChild
<
LLOutputMonitorCtrl
>
(
"speaking_indicator"
);
mSpeakingIndicator
->
setChannelState
(
LLOutputMonitorCtrl
::
UNDEFINED_CHANNEL
);
mInfoBtn
=
getChild
<
LLButton
>
(
"info_btn"
);
mProfileBtn
=
getChild
<
LLButton
>
(
"profile_btn"
);
...
...
This diff is collapsed.
Click to expand it.
indra/newview/lloutputmonitorctrl.cpp
+
10
−
5
View file @
bce1630e
...
...
@@ -74,9 +74,9 @@ LLOutputMonitorCtrl::LLOutputMonitorCtrl(const LLOutputMonitorCtrl::Params& p)
mSpeakerId
(
p
.
speaker_id
),
mIsModeratorMuted
(
false
),
mIsAgentControl
(
false
),
mIsActiveChannel
(
false
),
mIndicatorToggled
(
false
),
mShowParticipantsSpeaking
(
false
)
mShowParticipantsSpeaking
(
false
),
mChannelState
(
INACTIVE_CHANNEL
)
{
//static LLUIColor output_monitor_muted_color = LLUIColorTable::instance().getColor("OutputMonitorMutedColor", LLColor4::orange);
//static LLUIColor output_monitor_overdriven_color = LLUIColorTable::instance().getColor("OutputMonitorOverdrivenColor", LLColor4::red);
...
...
@@ -259,8 +259,13 @@ BOOL LLOutputMonitorCtrl::handleMouseUp(S32 x, S32 y, MASK mask)
void
LLOutputMonitorCtrl
::
setIsActiveChannel
(
bool
val
)
{
mIsActiveChannel
=
val
;
if
(
!
val
)
setChannelState
(
val
?
ACTIVE_CHANNEL
:
INACTIVE_CHANNEL
);
}
void
LLOutputMonitorCtrl
::
setChannelState
(
EChannelState
state
)
{
mChannelState
=
state
;
if
(
state
==
INACTIVE_CHANNEL
)
{
// switchIndicator will set it to TRUE when channel becomes active
setVisible
(
FALSE
);
...
...
@@ -316,7 +321,7 @@ void LLOutputMonitorCtrl::onChange()
// virtual
void
LLOutputMonitorCtrl
::
switchIndicator
(
bool
switch_on
)
{
if
(
mIsActiveChannel
&&
getVisible
()
!=
(
BOOL
)
switch_on
)
if
(
(
mChannelState
!=
INACTIVE_CHANNEL
)
&&
(
getVisible
()
!=
(
BOOL
)
switch_on
)
)
{
setVisible
(
switch_on
);
...
...
This diff is collapsed.
Click to expand it.
indra/newview/lloutputmonitorctrl.h
+
10
−
1
View file @
bce1630e
...
...
@@ -81,8 +81,16 @@ class LLOutputMonitorCtrl
void
setIsAgentControl
(
bool
val
)
{
mIsAgentControl
=
val
;
}
void
setIsTalking
(
bool
val
)
{
mIsTalking
=
val
;
}
enum
EChannelState
{
ACTIVE_CHANNEL
,
INACTIVE_CHANNEL
,
UNDEFINED_CHANNEL
};
// switchIndicator controls visibility, 'active channel' governs if we are allowed to show indicator
void
setIsActiveChannel
(
bool
val
);
void
setChannelState
(
EChannelState
state
);
void
setShowParticipantsSpeaking
(
bool
show
)
{
mShowParticipantsSpeaking
=
show
;
}
...
...
@@ -139,7 +147,6 @@ class LLOutputMonitorCtrl
bool
mIsModeratorMuted
;
bool
mIsMuted
;
bool
mIsTalking
;
bool
mIsActiveChannel
;
bool
mShowParticipantsSpeaking
;
LLPointer
<
LLUIImage
>
mImageMute
;
LLPointer
<
LLUIImage
>
mImageOff
;
...
...
@@ -155,6 +162,8 @@ class LLOutputMonitorCtrl
LLUUID
mSpeakerId
;
bool
mIndicatorToggled
;
EChannelState
mChannelState
;
};
#endif
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