diff options
| author | James Cook <james@lindenlab.com> | 2010-02-19 15:14:44 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-19 15:14:44 -0800 |
| commit | d3582dc3ffb1ecb8a8888d17c4196c1c446a9a9a (patch) | |
| tree | e6c4ac273ffc4f002cbcc8c1b9740d51d4712f55 /indra/newview/llinventorybridge.cpp | |
| parent | a5099524e2a89d0162053c7165468b72bcaa2571 (diff) | |
IM window titles are Display Name (SLID)
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index da95eaefca..6bff3dad64 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -31,8 +31,11 @@ */ #include "llviewerprecompiledheaders.h" + #include "llinventorybridge.h" +#include "llavatarnamecache.h" // IDEVO + #include "llagent.h" #include "llagentwearables.h" #include "llappearancemgr.h" @@ -3555,6 +3558,13 @@ void LLCallingCardBridge::performAction(LLFolderView* folder, LLInventoryModel* { 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.mSLID + ")"; + } LLUUID session_id = gIMMgr->addSession(callingcard_name, IM_NOTHING_SPECIAL, item->getCreatorUUID()); if (session_id != LLUUID::null) { |