diff options
| author | Richard Linden <none@none> | 2010-06-03 14:15:11 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-03 14:15:11 -0700 |
| commit | f79ac664dd6eead75368ced40110b6f0474aa92e (patch) | |
| tree | b24c616c96d32e0b20c5dd0a217701922f884ee6 /indra/newview/llinventorybridge.cpp | |
| parent | e2b8c1c699f75e234776beda939205a247fb1bc3 (diff) | |
| parent | 56e0d59ebcc98515c24f7706569b6e7362981432 (diff) | |
merge
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 b7495f7dbe..bad4697d17 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -35,6 +35,7 @@ // external projects #include "lltransfersourceasset.h" +#include "llavatarnamecache.h" // IDEVO #include "llagent.h" #include "llagentcamera.h" @@ -3494,6 +3495,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) { |