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
637105e5
Commit
637105e5
authored
15 years ago
by
Kent Quirk
Browse files
Options
Downloads
Plain Diff
Merge
parents
5e0be34c
167be8f7
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llnotificationhandler.h
+5
-0
5 additions, 0 deletions
indra/newview/llnotificationhandler.h
indra/newview/llnotificationhandlerutil.cpp
+14
-5
14 additions, 5 deletions
indra/newview/llnotificationhandlerutil.cpp
with
19 additions
and
5 deletions
indra/newview/llnotificationhandler.h
+
5
−
0
View file @
637105e5
...
@@ -356,6 +356,11 @@ class LLHandlerUtil
...
@@ -356,6 +356,11 @@ class LLHandlerUtil
*/
*/
static
void
addNotifPanelToIM
(
const
LLNotificationPtr
&
notification
);
static
void
addNotifPanelToIM
(
const
LLNotificationPtr
&
notification
);
/**
* Updates messages of IM floater.
*/
static
void
updateIMFLoaterMesages
(
const
LLUUID
&
session_id
);
/**
/**
* Updates messages of visible IM floater.
* Updates messages of visible IM floater.
*/
*/
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llnotificationhandlerutil.cpp
+
14
−
5
View file @
637105e5
...
@@ -252,6 +252,9 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type,
...
@@ -252,6 +252,9 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type,
session
->
mNumUnread
=
unread
;
session
->
mNumUnread
=
unread
;
session
->
mParticipantUnreadMessageCount
=
participant_unread
;
session
->
mParticipantUnreadMessageCount
=
participant_unread
;
// update IM floater messages
updateIMFLoaterMesages
(
session_id
);
// restore active session id
// restore active session id
if
(
active_session_id
.
isNull
())
if
(
active_session_id
.
isNull
())
{
{
...
@@ -415,12 +418,8 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification)
...
@@ -415,12 +418,8 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification)
}
}
// static
// static
void
LLHandlerUtil
::
update
Visible
IMFLoaterMesages
(
const
LL
NotificationPtr
&
notification
)
void
LLHandlerUtil
::
updateIMFLoaterMesages
(
const
LL
UUID
&
session_id
)
{
{
const
std
::
string
name
=
LLHandlerUtil
::
getSubstitutionName
(
notification
);
LLUUID
from_id
=
notification
->
getPayload
()[
"from_id"
];
LLUUID
session_id
=
spawnIMSession
(
name
,
from_id
);
LLIMFloater
*
im_floater
=
LLIMFloater
::
findInstance
(
session_id
);
LLIMFloater
*
im_floater
=
LLIMFloater
::
findInstance
(
session_id
);
if
(
im_floater
!=
NULL
&&
im_floater
->
getVisible
())
if
(
im_floater
!=
NULL
&&
im_floater
->
getVisible
())
{
{
...
@@ -428,6 +427,16 @@ void LLHandlerUtil::updateVisibleIMFLoaterMesages(const LLNotificationPtr& notif
...
@@ -428,6 +427,16 @@ void LLHandlerUtil::updateVisibleIMFLoaterMesages(const LLNotificationPtr& notif
}
}
}
}
// static
void
LLHandlerUtil
::
updateVisibleIMFLoaterMesages
(
const
LLNotificationPtr
&
notification
)
{
const
std
::
string
name
=
LLHandlerUtil
::
getSubstitutionName
(
notification
);
LLUUID
from_id
=
notification
->
getPayload
()[
"from_id"
];
LLUUID
session_id
=
spawnIMSession
(
name
,
from_id
);
updateIMFLoaterMesages
(
session_id
);
}
// static
// static
void
LLHandlerUtil
::
decIMMesageCounter
(
const
LLNotificationPtr
&
notification
)
void
LLHandlerUtil
::
decIMMesageCounter
(
const
LLNotificationPtr
&
notification
)
{
{
...
...
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