Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
JennaHuntsman
XDG Integration
Commits
09796dd0
Commit
09796dd0
authored
1 year ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix weird name cache connection crash
parent
ae4e5cdf
No related branches found
No related tags found
2 merge requests
!3
Update to main branch
,
!2
Rebase onto current main branch
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llpanelgroupbulk.cpp
+10
-1
10 additions, 1 deletion
indra/newview/llpanelgroupbulk.cpp
indra/newview/llpanelgroupbulk.h
+1
-0
1 addition, 0 deletions
indra/newview/llpanelgroupbulk.h
with
11 additions
and
1 deletion
indra/newview/llpanelgroupbulk.cpp
+
10
−
1
View file @
09796dd0
...
...
@@ -262,6 +262,10 @@ LLPanelGroupBulk::LLPanelGroupBulk(const LLUUID& group_id) :
LLPanelGroupBulk
::~
LLPanelGroupBulk
()
{
if
(
mAvatarNameCacheConnection
.
connected
())
{
mAvatarNameCacheConnection
.
disconnect
();
}
delete
mImplementation
;
}
...
...
@@ -350,6 +354,11 @@ void LLPanelGroupBulk::updateGroupData()
void
LLPanelGroupBulk
::
addUserCallback
(
const
LLUUID
&
id
,
const
LLAvatarName
&
av_name
)
{
if
(
mAvatarNameCacheConnection
.
connected
())
{
mAvatarNameCacheConnection
.
disconnect
();
}
std
::
vector
<
std
::
string
>
names
;
uuid_vec_t
agent_ids
;
agent_ids
.
push_back
(
id
);
...
...
@@ -403,7 +412,7 @@ void LLPanelGroupBulk::addUsers(uuid_vec_t& agent_ids)
if
(
!
LLAvatarNameCache
::
get
(
agent_id
,
&
av_name
))
{
// actually it should happen, just in case
LLAvatarNameCache
::
get
(
LLUUID
(
agent_id
),
boost
::
bind
(
&
LLPanelGroupBulk
::
addUserCallback
,
this
,
_1
,
_2
));
mAvatarNameCacheConnection
=
LLAvatarNameCache
::
get
(
LLUUID
(
agent_id
),
boost
::
bind
(
&
LLPanelGroupBulk
::
addUserCallback
,
this
,
_1
,
_2
));
// for this special case!
//when there is no cached name we should remove resident from agent_ids list to avoid breaking of sequence
// removed id will be added in callback
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llpanelgroupbulk.h
+
1
−
0
View file @
09796dd0
...
...
@@ -68,6 +68,7 @@ class LLPanelGroupBulk : public LLPanel
bool
mPendingGroupPropertiesUpdate
;
bool
mPendingRoleDataUpdate
;
bool
mPendingMemberDataUpdate
;
boost
::
signals2
::
connection
mAvatarNameCacheConnection
;
};
#endif // LL_LLPANELGROUPBULK_H
...
...
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