summaryrefslogtreecommitdiff
path: root/indra/newview/llmediactrl.cpp
AgeCommit message (Collapse)Author
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-02Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.Stinson Linden
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-09MAINT-4009: Improved patching of a memory leak for when menu items are ↵Stinson Linden
created before the viewer window initialization has created the menu holder. See also changeset bc0743639926a84b38b4907d252eff1cc0498c7d.
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2014-05-05MAINT-4009: Patching a small memory leak for when menu items were being ↵Stinson Linden
created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null.
2013-12-04ACME-1043 : WIP : Add an argument to open trusted content with js and other ↵Merov Linden
enabled options, bypassing prefs
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-06-05merge with viewer-releaseRichard Linden
2013-05-21mergeBrad Payne (Vir Linden)
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-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-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-13Large changes to the LLCurl::Responder API, as well as pulling in some ↵Don Kjer
changes to common libraries from the server codebase: * Additional error checking in http handlers. * Uniform log spam for http errors. * Switch to using constants for http heads and status codes. * Fixed bugs in incorrectly checking if parsing LLSD xml resulted in an error. * Reduced spam regarding LLSD parsing errors in the default completedRaw http handler. It should not longer be necessary to short-circuit completedRaw to avoid spam. * Ported over a few bug fixes from the server code. * Switch mode http status codes to use S32 instead of U32. * Ported LLSD::asStringRef from server code; avoids copying strings all over the place. * Ported server change to LLSD::asBinary; this always returns a reference now instead of copying the entire binary blob. * Ported server pretty notation format (and pretty binary format) to llsd serialization. * The new LLCurl::Responder API no longer has two error handlers to choose from. Overriding the following methods have been deprecated: ** error - use httpFailure ** errorWithContent - use httpFailure ** result - use httpSuccess ** completed - use httpCompleted ** completedHeader - no longer necessary; call getResponseHeaders() from a completion method to obtain these headers. * In order to 'catch' a completed http request, override one of these methods: ** httpSuccess - Called for any 2xx status code. ** httpFailure - Called for any non-2xx status code. ** httpComplete - Called for all status codes. Default implementation is to call either httpSuccess or httpFailure. * It is recommended to keep these methods protected/private in order to avoid triggering of these methods without using a 'push' method (see below). * Uniform error handling should followed whenever possible by calling a variant of this during httpFailure: ** llwarns << dumpResponse() << llendl; * Be sure to include LOG_CLASS(your_class_name) in your class in order for the log entry to give more context. * In order to 'push' a result into the responder, you should no longer call error, errorWithContent, result, or completed. * Nor should you directly call httpSuccess/Failure/Completed (unless passing a message up to a parent class). * Instead, you can set the internal content of a responder and trigger a corresponding method using the following methods: ** successResult - Sets results and calls httpSuccess ** failureResult - Sets results and calls httpFailure ** completedResult - Sets results and calls httpCompleted * To obtain information about a the response from a reponder method, use the following getters: ** getStatus - HTTP status code ** getReason - Reason string ** getContent - Content (Parsed body LLSD) ** getResponseHeaders - Response Headers (LLSD map) ** getHTTPMethod - HTTP method of the request ** getURL - URL of the request * It is still possible to override completeRaw if you want to manipulate data directly out of LLPumpIO. * See indra/llmessage/llcurl.h for more information.
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
re-introduced don's refactor of low-level openGL calls pulling out of llui and putting them into llrender. Took the new code from their updated versions from the CHUI merge, but put them in a place accessible to appearance utility.
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-09-08Removed most llappearance -> llui dependencies (LLTrans remains). Moved ↵Don Kjer
LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
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.
2011-12-12EXP-1711 FIX LLWindowShade doesn't stack multiple notificationsRichard Linden
2011-11-07finished removing remnants of media browserRichard Linden
2011-10-28Merge with headcallum
2011-10-27remove ignore_ui_scale flags and use web content scaling for all web_browser ↵Richard Linden
widgets
2011-10-25EXP-1471 WIP Add support for zooming web pages by a scale facxtorcallum
2011-10-10EXP-1310 FIX Profile button should open Web Profile floaterRichard Nelson
removed unused LLWeb functions for opening non-web media moved logic inside floaters and away from auxiliary functions
2011-09-06EXP-1196 FIX Fix param block template orderingRichard Linden
changed ordering of template loading relative to constructor setting of params moved a lot of constructor-set params to template files reviewed by Leslie
2011-08-29EXP-1122 FIX (Viewer) LLQtWebKit should support a JavaScript/content ↵callum
debugger to help content creators Viewer side changes to enable Web debugger.
2011-08-26EXP-1111 FIX LLQtWebKit (and related media system) should log events, ↵callum
progress etc. to make debugging problems easier
2011-07-13EXP-1009 WIP Teleport links from Search floater and destination guide in ↵Richard Linden
viewer fail with intrusted browser error in viewer
2011-06-06EXP-844 INITIAL CHECKIN - FUNCTION DISABLED - As a first time user I would ↵callum
like to see a video after I log in that highlights the best features of Second Life
2011-04-22EXP-738 FIX Login screen background image takes too long to loadcallum
Misc improvements to make the login page load properly.
2011-03-25SOCIAL-509 FIX There is no way to copy a user name from web profile with the ↵Richard Linden
mouse fixed spawning location of context menu removed keyboard shortcuts from context menus (where they don't belong)
2011-03-25SOCIAL-808 FIX Crash on exit in LLMediaCtrlcallum
2011-03-24SOCIAL-509 FIX There is no way to copy a user name from web profile with the ↵Richard Linden
mouse
2011-03-22SOCIAL-634 FIX Error condition content for Destination Guide, Avatar Picker,callum
and Help if S3 content or web content is not available
2011-03-17Fix for Mac specific compiler error. All enumerants of an enum have to be ↵callum
present in a switch statement if there is no default.
2011-03-17SOCIAL-634 FIX Error condition content for Destination Guide, Avatar Picker,callum
and Help if S3 content or web content is not available. (Included refs to new LLQtWebKit that supports functionality)
2010-12-20SOCIAL-399 FIX Viewer crash when canceling http auth on a media primMonroe Linden
Reviewed by Callum at http://codereview.lindenlab.com/5636001
2010-12-20Merge from viewer-development.Monroe Linden
2010-12-17SOCIAL-371 (PARTIAL) HTTP Auth sites do not load / allow login on Media on a ↵callum
Prim faces in Webkit 4.7 Fixes broken text substituition of realm/host only.
2010-12-16SOCIAL-370 FIX (2) Links to External Web Pages not working in Floaters such ↵callum
as Search in Webkit 4.7 branch
2010-12-15SOCIAL-387 FIX Clicking on links in TOS during account activation in the ↵callum
viewer do not launch browser in Webkit 4.7 Mis-assumption about floaters that spawn web-content
2010-12-14SOCIAL-366 FIX UI Issues with HTTP Dialogs in Webkit 4.7callum
2010-12-13SOCIAL-364 FIX(2) Viewer Crash when selecting Browse Linden Homes button ↵callum
from side panel Changed default floater that opens if no parent found as per comments in task
2010-12-13SOCIAL-367 FIX HTTP Auth dialog does not indicate what server a user is ↵callum
entering a user name and password for in Webkit 4.7
2010-12-10mergeRichard Linden
2010-12-10SOCIAL-364 FIX Viewer Crash when selecting Browse Linden Homes button from ↵callum
side panel
2010-12-10WIP XUI HTTP Auth dialogRichard Linden
refactored LLWindowShade into seperate file improved layout of dialog improved dialog resizing logic Tab and Enter keys now work as expected in windowshade form added "modal" capability to window shade added HTTP Auth notifications to MOAP
2010-12-02SOCIAL-317 FIX LLWebContentFloater opens popups in the media browsercallum
2010-12-01OCIAL-231 FIX Enable tooltips (for links and images)Monroe Linden
Added the necessary plumbing to get link_hovered events from the webkit plugin through to the viewer UI. This requires a llqtwebkit library built from revision 1799a899e06d or later in http://hg.secondlife.com/llqtwebkit to function. The viewer source changes are backwards-compatible with earlier versions of llqtwebkit, it just won't see any link_hovered events with previous revisions. Reviewed by Callum.