diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:18:29 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-21 14:18:29 -0400 |
| commit | 525de5554022b946641db446a5b5153f9e670e10 (patch) | |
| tree | d7d679724515f6eb839f87161510ba0a0d06c89b /indra/newview/llinventorybridge.cpp | |
| parent | 219cd6ecda60e1c48852f582f0994573fd0e10ae (diff) | |
| parent | 71f56a2bc9697989cd012adb57abdc922aa8ae0a (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 569dfc08e2..b15dcd993a 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -29,6 +29,7 @@ // external projects #include "lltransfersourceasset.h" +#include "llavatarnamecache.h" // IDEVO #include "llagent.h" #include "llagentcamera.h" @@ -3503,6 +3504,13 @@ void LLCallingCardBridge::performAction(LLInventoryModel* model, std::string act { std::string callingcard_name; gCacheName->getFullName(item->getCreatorUUID(), callingcard_name); + // IDEVO + LLAvatarName av_name; + if (LLAvatarNameCache::useDisplayNames() + && LLAvatarNameCache::get(item->getCreatorUUID(), &av_name)) + { + callingcard_name = av_name.mDisplayName + " (" + av_name.mUsername + ")"; + } LLUUID session_id = gIMMgr->addSession(callingcard_name, IM_NOTHING_SPECIAL, item->getCreatorUUID()); if (session_id != LLUUID::null) { |