summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-01-22 16:53:18 -0800
committerJames Cook <james@lindenlab.com>2010-01-22 16:53:18 -0800
commit48111a2ab847bb3bacf658b3771d0324157fc751 (patch)
treefec5b4a9f626a692649967ad485822cc764ba5ca /indra
parentdd9bfb6d859c5848b5ff6c8fdebbc34ab65f92e7 (diff)
Converted friend request names to SLID-compatible
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llavataractions.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 40c9bb6afa..8c4dfaea50 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -62,6 +62,7 @@
#include "llimfloater.h"
#include "lltrans.h"
#include "llcallingcard.h"
+#include "llslurl.h" // IDEVO
// static
void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::string& name)
@@ -73,7 +74,7 @@ void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::strin
}
LLSD args;
- args["NAME"] = name;
+ args["NAME"] = LLSLURL::buildCommand("agent", id, "inspect");
LLSD payload;
payload["id"] = id;
payload["name"] = name;
@@ -102,7 +103,7 @@ void LLAvatarActions::requestFriendshipDialog(const LLUUID& id)
}
std::string full_name;
- gCacheName->getFullName(id, full_name);
+ // IDEVO gCacheName->getFullName(id, full_name);
requestFriendshipDialog(id, full_name);
}