Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Black Dragon Viewer
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
Deploy
Releases
Package registry
Model registry
Operate
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
NiranV
Black Dragon Viewer
Commits
9cb30255
Commit
9cb30255
authored
15 years ago
by
James Cook
Browse files
Options
Downloads
Patches
Plain Diff
Fix Mac/Linux build
Dang finicky LLSD map dereferences
parent
55bfb443
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llmessage/llavatarnamecache.cpp
+5
-5
5 additions, 5 deletions
indra/llmessage/llavatarnamecache.cpp
with
5 additions
and
5 deletions
indra/llmessage/llavatarnamecache.cpp
+
5
−
5
View file @
9cb30255
...
@@ -86,8 +86,8 @@ void LLAvatarNameResponder::result(const LLSD& content)
...
@@ -86,8 +86,8 @@ void LLAvatarNameResponder::result(const LLSD& content)
const
LLSD
&
row
=
*
it
;
const
LLSD
&
row
=
*
it
;
LLAvatarName
av_name
;
LLAvatarName
av_name
;
av_name
.
mSLID
=
row
[
"slid"
];
av_name
.
mSLID
=
row
[
"slid"
]
.
asString
()
;
av_name
.
mDisplayName
=
row
[
"display_name"
];
av_name
.
mDisplayName
=
row
[
"display_name"
]
.
asString
()
;
av_name
.
mLastUpdate
=
now
;
av_name
.
mLastUpdate
=
now
;
// HACK for pretty stars
// HACK for pretty stars
...
@@ -100,13 +100,13 @@ void LLAvatarNameResponder::result(const LLSD& content)
...
@@ -100,13 +100,13 @@ void LLAvatarNameResponder::result(const LLSD& content)
if
(
av_name
.
mDisplayName
.
empty
())
if
(
av_name
.
mDisplayName
.
empty
())
{
{
// make up a display name
// make up a display name
std
::
string
first_name
=
row
[
"first_name"
];
std
::
string
first_name
=
row
[
"first_name"
]
.
asString
()
;
std
::
string
last_name
=
row
[
"last_name"
];
std
::
string
last_name
=
row
[
"last_name"
]
.
asString
()
;
av_name
.
mDisplayName
=
av_name
.
mDisplayName
=
LLCacheName
::
buildFullName
(
first_name
,
last_name
);
LLCacheName
::
buildFullName
(
first_name
,
last_name
);
}
}
LLUUID
agent_id
=
row
[
"agent_id"
];
LLUUID
agent_id
=
row
[
"agent_id"
]
.
asUUID
()
;
LLAvatarNameCache
::
sCache
[
agent_id
]
=
av_name
;
LLAvatarNameCache
::
sCache
[
agent_id
]
=
av_name
;
LLAvatarNameCache
::
sPendingQueue
.
erase
(
agent_id
);
LLAvatarNameCache
::
sPendingQueue
.
erase
(
agent_id
);
...
...
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