diff options
| author | James Cook <james@lindenlab.com> | 2010-02-04 20:38:40 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-04 20:38:40 -0800 |
| commit | c0b7c93c18783d6a426cf43265f34c86bdeceb4a (patch) | |
| tree | bd7ece31856a0e4d54e6be0ace990930301ed9d3 /indra/newview/llpanelavatar.cpp | |
| parent | 88350edbcbec615f3b15fc82bd5ce4005621ac6f (diff) | |
Converted all gCacheName->getName to getFullName for SLID compatibility
Also eliminated notification "ObjectGiveItemUnknownUser" because the
SLURL-based name lookup will always retrieve the user name.
Fixed a bug with ObjectGiveItem where the SLURL would be incorrect
for a group.
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 4a7cdfc856..500142aa67 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -226,12 +226,11 @@ void LLPanelAvatarNotes::rightsConfirmationCallback(const LLSD& notification, void LLPanelAvatarNotes::confirmModifyRights(bool grant, S32 rights) { - std::string first, last; + std::string full_name; LLSD args; - if (gCacheName->getName(getAvatarId(), first, last)) + if (gCacheName->getFullName(getAvatarId(), full_name)) { - args["FIRST_NAME"] = first; - args["LAST_NAME"] = last; + args["NAME"] = full_name; } if (grant) |