diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 13:53:25 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 13:53:25 -0700 |
| commit | 7f2e4c621ca297af47c67f31ccdf3bddbaae57b7 (patch) | |
| tree | ed00134d5718d0c734809e2da9266361ced06250 /indra/newview/llinventorybridge.cpp | |
| parent | da1a39c935d8ef660c35d01bf9d7c53af3adf7ae (diff) | |
| parent | 31220ceffbacdf0f14929b735b0c9e250e1225ca (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 14e5c8b93c..9e3f80e464 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3634,7 +3634,7 @@ void LLCallingCardBridge::performAction(LLInventoryModel* model, std::string act if (LLAvatarNameCache::useDisplayNames() && LLAvatarNameCache::get(item->getCreatorUUID(), &av_name)) { - callingcard_name = av_name.mDisplayName + " (" + av_name.mSLID + ")"; + 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) |