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

fixed EXT-2341 "Add Friend notification not shown", EXT-2351 "Friendship and 

Teleport offers no longer pop toast notifications";
suppresed IM-floater on incoming offer and registerd offer handler in chiclet
counter updater;

--HG--
branch : product-engine
meow-7.2.2
Alexei Arabadji 2009-11-11 12:09:46 +02:00
parent 2857dd026c
commit eed0b3460b
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llchiclet.cpp
View File

@ -103,6 +103,7 @@ LLNotificationChiclet::LLNotificationChiclet(const Params& p)
// connect counter handlers to the signals
connectCounterUpdatersToSignal("notify");
connectCounterUpdatersToSignal("groupnotify");
connectCounterUpdatersToSignal("offer");
}
LLNotificationChiclet::~LLNotificationChiclet()

5
indra/newview/llnotificationofferhandler.cpp
View File

@ -95,14 +95,9 @@ bool LLOfferHandler::processNotification(const LLSD& notify)
LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, notification->getPayload()["from_id"]);
if (!LLIMMgr::instance().hasSession(session_id))
{
// create session with faked type to avoid creating chicklets
session_id = LLIMMgr::instance().addSession(
notification->getSubstitutions()["NAME"], IM_NOTHING_SPECIAL,
notification->getPayload()["from_id"]);
if (session_id != LLUUID::null)
{
LLIMFloater::show(session_id);
}
}
LLIMMgr::instance().addMessage(session_id, LLUUID(),
notification->getSubstitutions()["NAME"],