//-------------------------------------------------------------------------- void LLOfferHandler::onRejectToast(LLUUID& id) { LLNotificationPtr notification = LLNotifications::instance().find(id); // if (notification // && LLNotificationManager::getInstance()->getHandlerForNotification( // notification->getType()) == this // // don't delete notification since it may be used by IM floater // && !LLHandlerUtil::canAddNotifPanelToIM(notification)) // { // LLNotifications::instance().cancel(notification); // } // [SL:KB] - Patch: UI-Notifications | Checked: 2011-04-11 (Catznip-2.5.0a) | Modified: Catznip-2.5.0a // NOTE: this will be fired from LLScreenChannel::killToastByNotificationID() which treats visible and stored toasts differently if ( (notification) && (!notification->isCancelled()) && (LLNotificationManager::getInstance()->getHandlerForNotification(notification->getType()) == this) ) { LLScreenChannel* pChannel = dynamic_cast<LLScreenChannel*>(mChannel); LLToast* pToast = (pChannel) ? pChannel->getToastByNotificationID(notification->getID()) : NULL; if ( (!pToast) || (pToast->getCanBeStored()) ) { LLNotifications::instance().cancel(notification); } } // [/SL:KB] }
//-------------------------------------------------------------------------- void LLScreenChannel::removeAndStoreAllStorableToasts() { if(mToastList.size() == 0) return; hideToastsFromScreen(); for(std::vector<ToastElem>::iterator it = mToastList.begin(); it != mToastList.end();) { LLToast* toast = it->getToast(); if(toast && toast->getCanBeStored()) { storeToast(*it); it = mToastList.erase(it); } else { ++it; } } redrawToasts(); }
//-------------------------------------------------------------------------- bool LLOfferHandler::processNotification(const LLSD& notify) { if(!mChannel) { return false; } LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID()); if(!notification) return false; // arrange a channel on a screen if(!mChannel->getVisible()) { initChannel(); } if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change") { if( notification->getPayload().has("give_inventory_notification") && !notification->getPayload()["give_inventory_notification"] ) { // This is an original inventory offer, so add a script floater LLScriptFloaterManager::instance().onAddNotification(notification->getID()); } else { notification->setReusable(LLHandlerUtil::isNotificationReusable(notification)); LLUUID session_id; // if (LLHandlerUtil::canSpawnIMSession(notification)) // [RLVa:KB] - Checked: 2010-04-20 (RLVa-1.2.2a) | Added: RLVa-1.2.0f // Don't spawn a new IM session for inventory offers if this notification was subject to @shownames=n // RELEASE-RLVa: [SL-2.3.0] Test on every new release to make sure the notification gets routed the way we want it to be bool fSpawnIM = (LLHandlerUtil::canSpawnIMSession(notification)) && (!notification->getPayload().has("rlv_shownames")); if (fSpawnIM) // [/RLVa:KB] { const std::string name = LLHandlerUtil::getSubstitutionName(notification); LLUUID from_id = notification->getPayload()["from_id"]; session_id = LLHandlerUtil::spawnIMSession(name, from_id); } bool show_toast = LLHandlerUtil::canSpawnToast(notification); // bool add_notid_to_im = LLHandlerUtil::canAddNotifPanelToIM(notification); // [RLVa:KB] - Checked: 2010-04-20 (RLVa-1.2.2a) | Added: RLVa-1.2.0f // NOTE: add_notid_to_im needs to be FALSE if we suppressed spawning an IM because in that case the notification needs to // be routed to the "syswell" or the inventory offer floater will dissapear and the user won't be able to accept it bool add_notid_to_im = (fSpawnIM) && (LLHandlerUtil::canAddNotifPanelToIM(notification)); // [/RLVa:KB] if (add_notid_to_im) { LLHandlerUtil::addNotifPanelToIM(notification); } if (notification->getPayload().has("SUPPRESS_TOAST") && notification->getPayload()["SUPPRESS_TOAST"]) { LLNotificationsUtil::cancel(notification); } else if(show_toast) { LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(notification); // don't close notification on panel destroy since it will be used by IM floater notify_box->setCloseNotificationOnDestroy(!add_notid_to_im); LLToast::Params p; p.notif_id = notification->getID(); p.notification = notification; p.panel = notify_box; p.on_delete_toast = boost::bind(&LLOfferHandler::onDeleteToast, this, _1); // we not save offer notifications to the syswell floater that should be added to the IM floater p.can_be_stored = !add_notid_to_im; LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel); if(channel) channel->addToast(p); // if we not add notification to IM - add it to notification well if (!add_notid_to_im) { // send a signal to the counter manager mNewNotificationSignal(); } } if (LLHandlerUtil::canLogToIM(notification)) { // log only to file if notif panel can be embedded to IM and IM is opened // [RLVa:KB] - Checked: 2010-04-20 (RLVa-1.2.2a) | Added: RLVa-1.2.0f if (notification->getPayload().has("rlv_shownames")) { // Log to chat history if this notification was subject to @shownames=n LLHandlerUtil::logToNearbyChat(notification, CHAT_SOURCE_SYSTEM); } else if (add_notid_to_im && LLHandlerUtil::isIMFloaterOpened(notification)) // [/RLVa:KB] // if (add_notid_to_im && LLHandlerUtil::isIMFloaterOpened(notification)) { LLHandlerUtil::logToIMP2P(notification, true); } else { LLHandlerUtil::logToIMP2P(notification); } } } } else if (notify["sigtype"].asString() == "delete") { if( notification->getPayload().has("give_inventory_notification") && !notification->getPayload()["give_inventory_notification"] ) { // Remove original inventory offer script floater LLScriptFloaterManager::instance().onRemoveNotification(notification->getID()); } else { // if (LLHandlerUtil::canAddNotifPanelToIM(notification) // && !LLHandlerUtil::isIMFloaterOpened(notification)) // [SL:KB] - Checked: 2010-04-20 (RLVa-1.2.2a) | Added: RLVa-1.2.0f // Repro: // 1) have someone drop you 2 inventory items (new IM session will be spawned) // 2) accept/decline the inventory offers as they come in // -> unread IM counter shows 0 // 3) toggle "Enable plain text chat history" while the IM session with the inventory offers isn't the active session // -> unread IM counter shows -2 // -> LLHandlerUtil::decIMMesageCounter() really should be fixed to check for "0" before decreasing the count but // there are enough bugfixes in RLVa as it is already :( // Fix: // - the one and only time we need to decrease the unread IM count is when we've clicked any of the buttons on the *toast* // - since LLIMFloater::updateMessages() hides the toast when we open the IM (which resets the unread count to 0) we should // *only* decrease the unread IM count if there's a visible toast since the unread count will be at 0 otherwise anyway LLScreenChannel* pChannel = dynamic_cast<LLScreenChannel*>(mChannel); LLToast* pToast = (pChannel) ? pChannel->getToastByNotificationID(notification->getID()) : NULL; if ( (pToast) && (!pToast->getCanBeStored()) ) // [/SL:KB] { LLHandlerUtil::decIMMesageCounter(notification); } mChannel->killToastByNotificationID(notification->getID()); } } return false; }