summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-01-05 14:35:07 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2010-01-05 14:35:07 +0200
commit1a781e0ac339bc4d5504119032d93877be02d051 (patch)
tree471ab4c50e3de415d81b7ee79d3d2256fb4bce33 /indra
parent47dc1fc3437c9c266204604e85d8489b6e580584 (diff)
parented7bf187882539a81ab9784682a0023ed9f77453 (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llavataractions.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 2a8c55e5db..9bed346700 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -595,7 +595,9 @@ void LLAvatarActions::requestFriendship(const LLUUID& target_id, const std::stri
LLSD args;
args["TO_NAME"] = target_name;
+
LLSD payload;
+ payload["from_id"] = target_id;
payload["SESSION_NAME"] = target_name;
payload["SUPPRES_TOST"] = true;
LLNotificationsUtil::add("FriendshipOffered", args, payload);