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
0a6570fe
Commit
0a6570fe
authored
15 years ago
by
Yuri Chebotarev
Browse files
Options
Downloads
Patches
Plain Diff
fix normal EXT-2893 Nearby toast should hide after log became opened
--HG-- branch : product-engine
parent
00fe55c9
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/llnearbychat.cpp
+14
-4
14 additions, 4 deletions
indra/newview/llnearbychat.cpp
indra/newview/llnearbychat.h
+2
-0
2 additions, 0 deletions
indra/newview/llnearbychat.h
with
16 additions
and
4 deletions
indra/newview/llnearbychat.cpp
+
14
−
4
View file @
0a6570fe
...
@@ -228,13 +228,23 @@ bool LLNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata)
...
@@ -228,13 +228,23 @@ bool LLNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata)
return
false
;
return
false
;
}
}
void
LLNearbyChat
::
onOpen
(
const
LLSD
&
key
)
void
LLNearbyChat
::
setVisible
(
BOOL
visible
)
{
{
LLNotificationsUI
::
LLScreenChannelBase
*
chat_channel
=
LLNotificationsUI
::
LLChannelManager
::
getInstance
()
->
findChannelByID
(
LLUUID
(
gSavedSettings
.
getString
(
"NearByChatChannelUUID"
)));
if
(
visible
)
if
(
chat_channel
)
{
{
chat_channel
->
removeToastsFromChannel
();
LLNotificationsUI
::
LLScreenChannelBase
*
chat_channel
=
LLNotificationsUI
::
LLChannelManager
::
getInstance
()
->
findChannelByID
(
LLUUID
(
gSavedSettings
.
getString
(
"NearByChatChannelUUID"
)));
if
(
chat_channel
)
{
chat_channel
->
removeToastsFromChannel
();
}
}
}
LLDockableFloater
::
setVisible
(
visible
);
}
void
LLNearbyChat
::
onOpen
(
const
LLSD
&
key
)
{
LLDockableFloater
::
onOpen
(
key
);
}
}
void
LLNearbyChat
::
setRect
(
const
LLRect
&
rect
)
void
LLNearbyChat
::
setRect
(
const
LLRect
&
rect
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llnearbychat.h
+
2
−
0
View file @
0a6570fe
...
@@ -53,6 +53,8 @@ class LLNearbyChat: public LLDockableFloater
...
@@ -53,6 +53,8 @@ class LLNearbyChat: public LLDockableFloater
/*virtual*/
void
onOpen
(
const
LLSD
&
key
);
/*virtual*/
void
onOpen
(
const
LLSD
&
key
);
/*virtual*/
void
setVisible
(
BOOL
visible
);
virtual
void
setRect
(
const
LLRect
&
rect
);
virtual
void
setRect
(
const
LLRect
&
rect
);
private:
private:
...
...
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