From 88c92afde594eb3dddc4c27d62805e01defd647b Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 16 Oct 2010 22:22:10 -0700 Subject: Ported profile button in friendship requests from Phoenix --- linden/indra/newview/llviewermessage.cpp | 7 +++++++ .../indra/newview/skins/default/xui/en-us/notifications.xml | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp index a512a66..dbf9d72 100755 --- a/linden/indra/newview/llviewermessage.cpp +++ b/linden/indra/newview/llviewermessage.cpp @@ -262,6 +262,13 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response) msg->addUUIDFast(_PREHASH_TransactionID, payload["session_id"]); msg->sendReliable(LLHost(payload["sender"].asString())); break; + case 2: + // Push another notification + // Do we need to check for OfferFriendshipNoMessage here ever? -- MC + LLNotifications::instance().add("OfferFriendship", notification["substitutions"], notification["payload"]); + LLURLDispatcher::dispatch(llformat("secondlife:///app/agent/%s/about",payload["from_id"].asString().c_str()), NULL, true); + break; + case 3: default: // close button probably, possibly timed out break; diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml index d7b078c..333e362 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml @@ -6009,8 +6009,12 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ index="1" name="Decline" text="Decline"/> +