summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
AgeCommit message (Collapse)Author
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-09-04mergeBrad Payne (Vir Linden)
2013-08-28merging viewer releaseGilbert Gonzales
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-10-23Merge latest viewer-release with FBCsimon
2013-09-13Build fix after patch for MAINT-3137dmitrykproductengine
2013-09-26MAINT-3163 FIXED Since CHUI, floaters can be moved totally underneath bottom ↵maksymsproductengine
toolbar buttons and "lost".
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-25VITA test framework - record events supportJeff (Gioffredo Linden)
2013-06-14WIP: sh-4035 backed out changes to appearance window confirmationprep@lindenlab.com
2013-06-07Removed some debug trackingprep@lindenlab.com
2013-06-05merge with viewer-releaseRichard Linden
2013-06-03SH-4035 spec change. If you revert after quiting, SL shutsdown.prep
2013-06-03Fix for sh-4221 Sometimes ctrl+q needed to be hit twiceprep
2013-05-28Sh-4035: Updated implementation according to new specs. Fixed a couple of ↵prep@lindenlab.com
outstanding bugs.
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-21mergeBrad Payne (Vir Linden)
2013-05-17CHUI-959 FIXED Resident picker allowed to open behind fui toolbarsmaksymsproductengine
2013-05-16CHUI-963 (Toggling chat fui button twice tears off nearby chat to lower left ↵mberezhnoy
corner also deletes other open conversations)
2013-05-10SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect standard naming conventions for handlers vs. reactors
2013-05-10SH-4035: Removed prompt to save if av just has outfit changes. Hooked up ↵prep@lindenlab.com
logic to handle ctrl+w and ctrl+shift+w confirmation prompts
2013-05-02Pull from viewer-fbcMerov Linden
2013-05-02ACME-307 Fix crash when clicking profile button: The crash was caused by ↵Gilbert Gonzales
existing code which was taking the last focused element and assuming it was a pointer to a LLUICtrl. Now assume the pointer is of type LLView since there is not need to have it as a LLUICtrl pointer.
2013-04-18CHUI-938 FIXED Pop up (?) notification steals focusmaksymsproductengine
2013-04-09CHUI-797 FIXED Only one separated conversation window is shown after exiting ↵PavelK ProductEngine
from mouselook view Added all separated conversation floaters to skip list used in gFloaterView->popVisibleAll(skip_list) in llagent.cpp since LLFloaterIMContainer::setVisible() takes control of them by itself.
2013-04-11CHUI-921 FIXED Default position of open floaters starts at left edge of ↵maksymsproductengine
viewer behind toolbar
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-08CHUI-835 (ctrl-h does not select nearby chat conversation in list): Modified ↵Gilbert Gonzales
setVisibleAndFrontMost() to now take a arguement for the key that was pressed (if one was pressed). This allows the floater to select the converation line item when becoming visible/frontmost.
2013-02-23CHUI-568 : Fixed! Implemented Ctrl-H for Nearby Chat, taking into account ↵Merov Linden
the existence of other conversations and docked/torn off state
2013-02-21CHUI-568 : WIP : Introduced Ctrl-T and Ctrl-H for conversations and nearby chatMerov Linden
2013-02-14CHUI-753 : Fixed (temptative) : Added some defensive coding in ↵Merov Linden
bringToFront() to make safer or avoid pointer casting.
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-16CHUI-650 (Floaters not returning to active transparency after becoming inactive)maxim@mnikolenko
- Checking is added(comparing to previous fix) to avoid crash.
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-19merge with viewer-developmentRichard Linden
2012-11-15CHUI-489: Code review cleanup for both CHUI-489 and CHUI-486. This should be ↵Gilbert Gonzales
last commit for CHUI-489.
2012-11-15merging in latest changesGilbert Gonzales
2012-11-15CHUI-489: Now sounds exist for teleport and inventory offers. The sound is ↵Gilbert Gonzales
specified in notifications.xml. Also changes for CHUI 486, which allow the user to set preferences for hearing sounds for a New Conversation, Incoming Voice Call, Teleport Offer and Inventory Offer.
2012-11-15CHUI-524: The root reason of crash was in the infinity recursion in the ↵maksymsproductengine
chain of calls LLFloater::setFocus->LLFloater::setFrontmost->LLFloaterView::bringToFront. And problem was not related to CHUI-362. Reviewed by Stinson.
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-02SH-3499 Ensure asset stats output is correctRichard Linden
improvements to predicate API default rules encapsulated in LLInitParam removed empty flag from viewer asset stats
2012-11-01SH-3499 Ensure asset stats output is correctRichard Linden
added support for specifying predicates for xui and llsd serialization
2012-10-30CHUI-415 FIXED Set focus to dependee floater before removing dependent ↵maxim_productengine
floater from it
2012-09-24CHUI-355 FIXED Nearby chat entries do not appear in torn off nearby chat ↵AlexanderP ProductEngine
window when opening from a toast: moved setIsSingleInstance() from constructor to postBuild() for prevent of a resetting it in buildFromXML(); implemented correct set of mReuseInstance; changed type of the key of LLIMConversation from LLUUID() to LLSD()
2012-09-06Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
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.