summaryrefslogtreecommitdiff
path: root/indra/newview/llmediactrl.h
AgeCommit message (Collapse)Author
2010-09-16mergeRichard Linden
2010-09-16popup blocking notifications now handled in all web_browser instances, not ↵Richard Linden
just llfloatermediabrowser
2010-09-16Merge of popup-geometry code.Monroe Linden
2010-09-16EXP-29 WIP Implement popup blockingRichard Linden
added web popup notification overlay
2010-09-15Enable web popups to specify size and position of the Media Browser window ↵Monroe Linden
from javascript. This includes a Mac build of llqtwebkit from the following sources: revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a of http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision 81ab5ae326f0 of http://hg.secondlife.com/llqtwebkit (currently head of the default branch) Reviewed by Callum.
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-02EXT-8540 - Implement mime type override for web_browser ctrlRichard Nelson
reviewed by Monroe
2010-05-21Fix for EXT-5667 (support window.open() in shared media so google docs will ↵Monroe Linden
work). Moved the processing of clicks on _external and _blank targeted links from LLMediaCtrl to LLViewerMediaImpl. Removed LLMediaCtrl::setOpenInExternalBrowser() since that functionality is available through the use of the _external target attribute in web content. Removed LLMediaCtrl:: setOpenInInternalBrowser() since it was unimplemented and not used. Made the webkit media plugin set llqtwebkit's window open behavior to WOB_SIMULATE_BLANK_HREF_CLICK. This is #ifdefed out on Linux until we get a new Linux build of llqtwebkit.
2010-03-08https://jira.secondlife.com/browse/EXT-5884skolb
Added code to support SLAPPS for Media on a Prim Reviewed by Monroe and Callum via Code Collab (Review 143).
2010-01-22PARTIAL FIX EXT-3491: only bring up "external browser"notification if target ↵Rick Pasetto
is external or pref is set Review #86 This changes the logic to bring up the notification "Do you want to open your Web browser to view this content?" only if either the target is _external, or the user pref says to. Otherwise it avoids the notification.
2010-01-14EXT-3624: Support "_blank" href target types.Lynx Linden
Support href links in web views that have a target attribute set to "_blank". This will open the link in the user's preferred browser (internal or external, as defined in Prefs). This change relies on the new llqtwebkit package that has just been pushed. Also updated the hardcoded Qt version number in the About floater.
2009-12-17Made LLPanelLogin tell the browser plugin to clear its cache before opening ↵Monroe Linden
the login screen. Added clearCache() functions to LLViewerMediaImpl and LLMediaCtrl to facilitate this.
2009-11-16Hopefully the final fix for DEV-42800 (white flash at login).Monroe Linden
Reinstated the hide_loading parameter to LLMediaCtrl, and made it cause LLMediaCtrl::draw() to early-exit between creating the LLViewerMediaImpl and receiving the initial MEDIA_EVENT_NAVIGATE_COMPLETE.
2009-10-23Changes to match new version of llqtwebkit -- passing modifier keys through ↵Monroe Linden
to most user events and using new scroll wheel event.
2009-10-01svn merge -r 134922:134973 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.