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
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
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
Alchemy Archive
Alchemy Viewer
Commits
9a79b6f3
Commit
9a79b6f3
authored
13 years ago
by
Ansariel Hiller
Browse files
Options
Downloads
Patches
Plain Diff
storm-1717: fix avatar names in object details floater
parent
34b44fe7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/contributions.txt
+1
-0
1 addition, 0 deletions
doc/contributions.txt
indra/newview/llfloaterinspect.cpp
+35
-4
35 additions, 4 deletions
indra/newview/llfloaterinspect.cpp
indra/newview/llfloaterinspect.h
+4
-0
4 additions, 0 deletions
indra/newview/llfloaterinspect.h
with
40 additions
and
4 deletions
doc/contributions.txt
+
1
−
0
View file @
9a79b6f3
...
...
@@ -171,6 +171,7 @@ Ansariel Hiller
VWR-25480
VWR-26150
STORM-1685
STORM-1717
Aralara Rajal
Ardy Lay
STORM-859
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llfloaterinspect.cpp
+
35
−
4
View file @
9a79b6f3
...
...
@@ -37,6 +37,7 @@
#include
"llselectmgr.h"
#include
"lltoolcomp.h"
#include
"lltoolmgr.h"
#include
"lltrans.h"
#include
"llviewercontrol.h"
#include
"llviewerobject.h"
#include
"lluictrlfactory.h"
...
...
@@ -166,6 +167,15 @@ LLUUID LLFloaterInspect::getSelectedUUID()
return
LLUUID
::
null
;
}
void
LLFloaterInspect
::
onGetAvNameCallback
(
const
LLUUID
&
idCreator
,
const
LLAvatarName
&
av_name
,
void
*
FloaterPtr
)
{
if
(
FloaterPtr
)
{
LLFloaterInspect
*
floater
=
(
LLFloaterInspect
*
)
FloaterPtr
;
floater
->
dirty
();
}
}
void
LLFloaterInspect
::
refresh
()
{
LLUUID
creator_id
;
...
...
@@ -205,11 +215,32 @@ void LLFloaterInspect::refresh()
substitution
[
"datetime"
]
=
(
S32
)
timestamp
;
LLStringUtil
::
format
(
timeStr
,
substitution
);
const
LLUUID
&
idOwner
=
obj
->
mPermissions
->
getOwner
();
const
LLUUID
&
idCreator
=
obj
->
mPermissions
->
getCreator
();
LLAvatarName
av_name
;
LLAvatarNameCache
::
get
(
obj
->
mPermissions
->
getOwner
(),
&
av_name
);
owner_name
=
av_name
.
getCompleteName
();
LLAvatarNameCache
::
get
(
obj
->
mPermissions
->
getCreator
(),
&
av_name
);
creator_name
=
av_name
.
getCompleteName
();
// Only work with the names if we actually get a result
// from the name cache. If not, defer setting the
// actual name and set a placeholder.
if
(
LLAvatarNameCache
::
get
(
idOwner
,
&
av_name
))
{
owner_name
=
av_name
.
getCompleteName
();
}
else
{
owner_name
=
LLTrans
::
getString
(
"RetrievingData"
);
LLAvatarNameCache
::
get
(
idOwner
,
boost
::
bind
(
&
LLFloaterInspect
::
onGetAvNameCallback
,
_1
,
_2
,
this
));
}
if
(
LLAvatarNameCache
::
get
(
idCreator
,
&
av_name
))
{
creator_name
=
av_name
.
getCompleteName
();
}
else
{
creator_name
=
LLTrans
::
getString
(
"RetrievingData"
);
LLAvatarNameCache
::
get
(
idCreator
,
boost
::
bind
(
&
LLFloaterInspect
::
onGetAvNameCallback
,
_1
,
_2
,
this
));
}
row
[
"id"
]
=
obj
->
getObject
()
->
getID
();
row
[
"columns"
][
0
][
"column"
]
=
"object_name"
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llfloaterinspect.h
+
4
−
0
View file @
9a79b6f3
...
...
@@ -29,6 +29,7 @@
#ifndef LL_LLFLOATERINSPECT_H
#define LL_LLFLOATERINSPECT_H
#include
"llavatarname.h"
#include
"llfloater.h"
//class LLTool;
...
...
@@ -53,6 +54,9 @@ public:
void
onClickCreatorProfile
();
void
onClickOwnerProfile
();
void
onSelectObject
();
static
void
onGetAvNameCallback
(
const
LLUUID
&
idCreator
,
const
LLAvatarName
&
av_name
,
void
*
FloaterPtr
);
LLScrollListCtrl
*
mObjectList
;
protected:
// protected members
...
...
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