summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
AgeCommit message (Collapse)Author
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-09-26MAINT-994 Oskar Linden login issuesKelly Washington
* Set max persistent notifications to 250 * Don't register for notification callbacks until after peristent ones are loaded. reviewed with Simon
2012-10-11Change LLDir::findSkinnedFilenames() to use enum instead of bool.Nat Goodspeed
At Richard's suggestion, changed the bool merge parameter to new enum ESkinConstraint with values CURRENT_SKIN and ALL_SKINS. This clarifies what we're requesting at the point of the call.
2012-10-10Introduce new LLDir::findSkinnedFilenames() method. Use as needed.Nat Goodspeed
In a number of different places, for different reasons, the viewer wants to load a UI-related file that might be overridden by a non-default skin; and within that skin, might further be overridden by a non-default language. Apparently, for each of those use cases, every individual developer approached it as an entirely new problem, solving it idiosyncratically for that one case. Not only is this a maintenance problem, but it rubs one's nose in the fact that most such solutions consider only a subset of the relevant skin directories. Richard and I evolved an API intended to address all such cases: a central LLDir method returning a list of relevant pathnames, from most general to most localized, filtered to present only existing files; plus a couple of convenience methods to specifically obtain the most general and most localized available file. There were several load-skinned-file methods (LLFloater::buildFromFile(), LLPanel::buildFromFile() and LLUICtrlFactory::createFromFile() -- apparently cloned-and-modified from each other) that contained funky bolted-on logic to output the loaded data to an optional passed LLXMLNodePtr param. The trouble is that passing that param forced each of these methods to subvert its normal search: specifically for that case, it needed to find the baseline XML file instead of the localized one. Richard agreed that for the intended usage (reformatting XML files) we should use XML schema instead, and that the hacky functionality should be removed. Remove it. Also remove LLUICtrlFactory::getLocalizedXMLNode(), only used for those three special cases. Some callers explicitly passed the optional LLXMLNodePtr param as NULL. Remove that. Remove LLFloaterUIPreview::displayFloater(save) param, which relied on the optional output LLXMLNodePtr param. Make onClickSaveFloater() and onClickSaveAll() emit popupAndPrintWarning() about discontinued functionality. Recast LLFloater::buildFromFile(), LLPanel::buildFromFile(), LLUICtrlFactory::createFromFile(), LLNotifications::loadTemplates(), LLUI::locateSkin(), LLFontRegistry::parseFontInfo(), LLUIColorTable::loadFromSettings(), LLUICtrlFactory::loadWidgetTemplate(), LLUICtrlFactory::getLayeredXMLNode(), LLUIImageList::initFromFile(), LLAppViewer::launchUpdater() and LLMediaCtrl::navigateToLocalPage() to use findSkinnedFilenames(). (Is LLAppViewer::launchUpdater() ever called any more? Apparently so -- though the linux-updater.bin logic to process the relevant command-line switch has been disabled. Shrug.) (Is LLMediaCtrl::navigateToLocalPage() ever used?? If so, why?) Remove LLUI::setupPaths(), getXUIPaths(), getSkinPath() and getLocalizedSkinPath(). Remove the skins/paths.xml file read by setupPaths(). The only configuration it contained was the pair of partial paths "xui/en" and "xui/[LANGUAGE]" -- hardly likely to change. getSkinPath() specifically returned the first of these, while getLocalizedSkinPath() specifically returned the second. This knowledge is now embedded in findSkinnedFilenames(). Also remove paths.xml from viewer_manifest.py. Remove injected xui_paths from LLFontGL::initClass() and LLFontRegistry::LLFontRegistry(). These are no longer needed since LLFontRegistry can now directly consult LLDir for its path search. Stop passing LLUI::getXUIPaths() to LLFontGL::initClass() in LLViewerWindow's constructor and initFonts() method. Add LLDir::append() and add() methods for the simple task of combining two path components separated by getDirDelimiter() -- but only if they're both non-empty. Amazing how often that logic is replicated. Replace some existing concatenations with add() or append(). New LLDir::findSkinnedFilenames() method must know current language. Allow injecting current language by adding an LLDir::setSkinFolder(language) param, and pass it where LLAppViewer::init() and initConfiguration() currently call setSkinFolder(). Also add LLDir::getSkinFolder() and getLanguage() methods. Change LLFLoaterUIPreview's LLLocalizationResetForcer helper to "forcibly reset language" using LLDir::setSkinFolder() instead of LLUI::setupPaths(). Update LLDir stubs in lldir_stub.cpp and llupdaterservice_test.cpp. Add LLDir::getUserDefaultSkinDir() to obtain often-overlooked possible skin directory -- like getUserSkinDir() but with "default" in place of the current skin name as the last path component. (However, we hope findSkinnedFilenames() obviates most explicit use of such individual skin directory pathnames.) Add LLDir unit tests for new findSkinnedFilenames() and add() methods -- the latter exercises append() as well. Tweak indra/integration_tests/llui_libtest/llui_libtest.cpp for all the above. Notably, comment out its export_test_floaters() function, since the essential LLFloater::buildFromFile(optional LLXMLNodePtr) functionality has been removed. This may mean that llui_libtest.cpp has little remaining value, not sure.
2012-06-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-05-18MAINT-938 ADDITIONAL FIX (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
- Requested permissions are added dynamically to the dialog's footer - And the footer is not shown when it is empty
2012-05-17MAINT-938 FIXED (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
- Added new tag called "footer" to the notification. This tag allows to display messages under the buttons in toasts. - Created new class LLToastScriptQuestion for the "ScriptQuestionCaution" notification. This notification supports tag <footer>.
2012-04-27PATH-585: Adding an initial notification for when a server-side automatic ↵Todd Stinson
unfreeze occurs.
2012-01-23fix for compile errorRichard Linden
2012-01-23EXP-1837 FIX parsing notifications.xml during startup can take > 40 seconds ↵Richard Linden
(in non-release builds) added logging to track length of time spent reading notifications templates
2011-10-19mergeDave Parks
2011-10-10added compound LLSD parsing to param blocksRichard Nelson
reviewed by Leslie
2011-09-28SH-2276 Remove some log spam to alleviate stalls on login.Dave Parks
2011-09-14EXP-1201 FIX Quit button option not present in Mode Changing and Exit viewer ↵Richard Nelson
dialogs
2011-05-12STORM-1175 Fixing close button, for Custom Port warning, in Preferences => ↵Ima Mechanique
Setup => Network.
2011-03-09SOCIAL-676 FIX Both move UI hints shown in Advanced skinRichard Linden
accidentally removed loading of visibility rules
2011-03-09SOCIAL-659 FIX Viewer crash when selecting report option from mini-inspector ↵Richard Linden
in minimal and standard skin
2011-03-09fix for mac and linux buildsRichard Linden
2011-03-09SOCIAL-654 WIP Items purchased on Marketplace.secondlife.com while logged ↵Richard Linden
into Minimal skin are declined and not present in inventory made notification text skinnable
2011-03-01SOCIAL-618 FIX Move UI hint not being shown in Minimal skinRichard Linden
duplicate suppression will now properly delete extra notifications, fixing memory leak
2011-01-20VWR-24317: remove warning due to unassigned variableAleric Inglewood
2010-12-20Merge from viewer-development.Monroe Linden
2010-11-18SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1Richard Linden
initial support for XUI auth dialog
2010-11-15mergeRichard Linden
2010-11-10EXP-428 FIXED Display of llDialog and some other dialogs that should not be ↵Richard Linden
suppressable is broken
2010-11-08EXP-421 FIX Notifications tab in Preferences not working properlyRichard Linden
fixed logic so that ignore consistently means *don't show* the notification the ignore settings still store "show the notification if true" values
2010-11-08EXP-421 FIX Notifications tab in Preferences not working properlyRichard Linden
reverted to old sense where ignore setting of notifications has meaning true=show false=ignore reviewed by Callum
2010-10-11fix for default notification form valus not appearingRichard Linden
2010-10-07Fixed a problem that prevented notification tags from being parsed.Monroe Linden
Added some lldebugs to the LLNotificationTemplate constructor and LLNotifications::isVisibleByRules() that may be useful in debugging notification issues in the future.
2010-10-05changed format of notification_visibility rules to be cleanerRichard Linden
2010-10-04Test mergecallum
2010-10-01More precise control of notifications using notification_visibility.xml.Monroe Linden
Added a "name" property that lets a rule match a specific notification. Added a "response" property that lets a rule specify a response when it matches. Reviewed by Richard.
2010-10-12MergeLeyla Farazha
2010-10-08Created a floater for setting display nameLeyla Farazha
2010-09-30Adding tags mechanism to notification visibility rules.Monroe Linden
Also started adding the tag 'fail' to entries in notifications.xml that are failures the user should always be told about. Reviewed by Richard.
2010-09-30Cancel hidden notifications instead of using empty responses.Monroe Williams
This is more work on EXP-111. Reviewed by Richard.
2010-09-29Change non-visible notifications to return empty response instead of default.Monroe Linden
This is part of EXP-111. Reviewed by Richard.
2010-09-29added max_length_chars to notification paramsLeyla Farazha
2010-09-28Add XML validation in LLNotifications when loading notifications.xml and ↵Monroe Linden
notification_visibility.xml. Reviewed by Richard.
2010-09-28Added a mechanism for preventing classes of notifications from being ↵Monroe Linden
displayed, controlled by the notification_visibility.xml file in the viewer skin. Reviewed by Richard.
2010-09-27MergeLeyla Farazha
2010-09-27mergeRichard Nelson
2010-09-24trivial indentation changes while I'm poking around here.Tofu Linden
(transplanted from 01d8534678f5613c924a036128addf6b7447c92a)
2010-09-22cleaned up notifications.xml and made global notifications toggle not use or ↵Richard Linden
modify saved responses
2010-09-22instead of exposing mutable container in LLInitParam::Multiple, just expose ↵Richard Linden
access functions, begin(), end(), etc. this allows mutation of param block contents, without being able to change number of elements
2010-09-21fix for mac build and possible crash when responding to notification twiceRichard Linden
2010-09-20EXP-82 FIX MOTD open in external browser notification not given until fully ↵Richard Nelson
logged in reviewed by Monroe
2010-09-17fix for clicking on Invite Friends resulting in disabling popupsRichard Linden
2010-09-16fix for all notifications being ignored by defaultRichard Linden
2010-09-16added ability to have notification ignore variable point to settings.xml ↵Richard Linden
variables