livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/ 

--HG--
branch : product-engine
meow-7.2.2
Alexei Arabadji 2009-11-13 18:50:10 +02:00
parent 3add88cd97 638a21045b
commit f9d3791aaf
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llnotificationofferhandler.cpp
View File

@ -96,11 +96,11 @@ bool LLOfferHandler::processNotification(const LLSD& notify)
if (!LLIMMgr::instance().hasSession(session_id))
{
session_id = LLIMMgr::instance().addSession(
notification->getSubstitutions()["NAME"], IM_NOTHING_SPECIAL,
notification->getSubstitutions()["OBJECTFROMNAME"], IM_NOTHING_SPECIAL,
notification->getPayload()["from_id"]);
}
LLIMMgr::instance().addMessage(session_id, LLUUID(),
notification->getSubstitutions()["NAME"],
notification->getSubstitutions()["OBJECTFROMNAME"],
notification->getMessage());
LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(notification);

4
indra/newview/llviewermessage.cpp
View File

@ -1365,7 +1365,9 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
payload["from_id"] = info->mFromID;
args["OBJECTFROMNAME"] = info->mFromName;
args["NAME"] = info->mFromName;
args["NAME"] = LLSLURL::buildCommand("agent", info->mFromID, "about");
std::string verb = "highlight?name=" + msg;
args["ITEM_SLURL"] = LLSLURL::buildCommand("inventory", info->mObjectID, verb.c_str());
LLNotification::Params p("ObjectGiveItem");
p.substitutions(args).payload(payload).functor.function(boost::bind(&LLOfferInfo::inventory_offer_callback, info, _1, _2));

8
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -4957,8 +4957,9 @@ No valid parcel could be found.
<notification
icon="notify.tga"
name="ObjectGiveItem"
type="notify">
An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME].
type="offer">
An object named [OBJECTFROMNAME] owned by [NAME] has offered you [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
<button
index="0"
@ -5000,7 +5001,8 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you a
icon="notify.tga"
name="UserGiveItem"
type="offer">
[NAME] has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
[NAME] has offered you [OBJECTTYPE]:
[ITEM_SLURL]
<form name="form">
<button
index="0"

4
indra/newview/skins/default/xui/en/panel_notification.xml
View File

@ -75,7 +75,9 @@
top="10"
visible="false"
width="285"
wrap="true"/>
wrap="true"
parse_highlights="true"
allow_html="true"/>
</panel>
<panel
background_visible="false"