summaryrefslogtreecommitdiff
path: root/indra/newview/llcallingcard.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 11:19:51 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 11:19:51 +0000
commit44cfa948c7a8bf6786b204c35973ac879cdfc491 (patch)
treec34ec0cc9e0c73a72071463d71caa068d2af2659 /indra/newview/llcallingcard.cpp
parenta4ef5e2b0d4e36aa98f2e4074f4ddd4cad3d3106 (diff)
parentfc1af768b800c890cda8ef3e8b9ee2537ca1d92a (diff)
merge.
Diffstat (limited to 'indra/newview/llcallingcard.cpp')
-rw-r--r--indra/newview/llcallingcard.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index d988770f90..996139fccc 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -56,6 +56,7 @@
#include "llnotifications.h"
#include "llnotificationsutil.h"
#include "llresmgr.h"
+#include "llslurl.h"
#include "llimview.h"
#include "llviewercontrol.h"
#include "llviewernetwork.h"
@@ -689,13 +690,8 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
setBuddyOnline(agent_id,online);
if(chat_notify)
{
- std::string first, last;
- if(gCacheName->getName(agent_id, first, last))
- {
- notify = TRUE;
- args["FIRST"] = first;
- args["LAST"] = last;
- }
+ notify = TRUE;
+ args["NAME_SLURL"] = LLSLURL::buildCommand("agent", agent_id, "about");
}
}
else