summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
AgeCommit message (Collapse)Author
2010-03-18Fix for EXT-6304: Shared media cookies cannot be deleted via PreferencesMonroe Linden
Added static member functions to LLViewerMedia: clearAllCookies(), clearAllCaches(), setCookiesEnabled(), and setProxyConfig(). These iterate through all loaded instances and send appropriate messages. Also added a hack to clearAllCookies() to delete cookie files for all accounts, which should serve until we centralize cookie storage. Made LLViewerMedia set the proxy config properly when creating new instances. Callum is adding code to do something similar with the cookies enabled flag in a separate commit. Removed get_web_media from llfloaterpreference.cpp and reworked everything that used it to use the new LLViewerMedia functions instead. Reviewed by Callum at http://codereview.lindenlab.com/838003.
2010-03-16Added an "init" message in LLPLUGIN_MESSAGE_CLASS_MEDIA, and made ↵Monroe Linden
LLPluginClassMedia queue it up before initializing its LLPluginProcessParent. Made all existing plugins send their texture_params message from this init message instead of the LLPLUGIN_MESSAGE_CLASS_BASE "init" message. (This ensures that they won't start to receive 'size_change' messages until after the init has happened.) Added "set_user_data_path" and "set_language_code" messages to LLPluginClassMedia. Made webkit plugin deal with the new messages, when they're sent before it receives the media "init". Removed the user_data_path and language_code arguments from the init function calls throughout the hierarchy. Made LLViewerMediaImpl queue up the language code and user data path messages before initializing the media. Reviewed by Callum at http://codereview.lindenlab.com/687006 .
2010-03-12(for B5) Fix for EXT-5823 "Include language in user-agent string" ↵Callum Prentice
(implemented via JavaScript - not in ua string) (for B5) Fix for EXT-5314 "Inworld Browser blanks out at credit card entry" Note: also includes an update to install.xml that points to a new version of LLQtWebKit that is required for these fixes
2010-03-08Local mergeskolb
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-03-04Merge with tipCallum Prentice
2010-03-04Fix for EXT-5960 (Store media cookies per user rather than per viewer)Callum Prentice
Reviewed by RN and MW
2010-03-03Potential fix for EXT-5850 (Crash in LLPluginClassMedia::idle)Monroe Linden
We don't actually have a repro for this bug, just a number of crash reports. This potential fix makes an iterator loop safer in the face of the iterator changing during the loop. See the jira for further details. Reviewed by Richard at http://codereview.lindenlab.com/331008
2010-03-01https://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-02-25EXT-5410 Streaming audio does ignores preference setting.angela
2010-02-23merg and resolve conflictsangela
2010-02-23revert some changed from EXT-5410 but keep the changes for disabling ↵angela
streaming audio when music or media is disabled. reviewed by rick
2010-02-22Follow-up from previous change based on code review #137Rick Pasetto
2010-02-22FIX (unposted bug): "hasMedia" and "hasAudio" no longer checks preferences: ↵Rick Pasetto
it's now up to callers to decide to do that Review #137
2010-02-22Fix (unposted bug): media "affordance" was not properly being disabled when ↵Rick Pasetto
media was disabled
2010-02-22EXT-5410 Streaming audio does ignores preference setting.angela
2010-02-18EXT-5363 webkit does not strip spaces off a typed-in URLCallum Prentice
Reviewed by CB
2010-02-16Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0Rick Pasetto
2010-02-16EXT-5270: Implement "dynamic" controls based on the selected item in Nearby ↵Rick Pasetto
Media Review #112 This change adds controls that change state based on the selection in the nearby media panel. There are basically 3 sets: - Time-based - Web-based ("Normal") - Disabled Again, these change based on what you've got selected in the panel
2010-02-16EXT-5394 [crashhunters] Crash in LLViewerMediaImpl::calculateInterest()Tofu Linden
2010-02-12EXT-5267 EXT-5268: Add Parcel Media and Parcel Audio items to nearby media panelRick Pasetto
Review #109 This (fairly major) change adds new "items" to the media list for Parcel Media and Parcel Audio. Since these items are special (before the items were always MoaP impls), they had to be treated special. Moreover, actions on all of "media" had to be centralized so that they would have similar behavior.
2010-02-10Code review feedback: add comments, move teleport hook to a callback in ↵Rick Pasetto
llviewermedia Review #100
2010-02-10EXT-5261 EXT-5263 EXT-5265 EXT-5266 EXT-5271 - Reformat NMF and enable ↵Rick Pasetto
behavior of media toggle in chrome Review #100 http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=100 This encompasses the first of the behavioral and structural changes for the Nearby Media Floater and the chrome button at the top of the UI. It includes: - Removal of the Parcel Media and Parcel Audio UI. Still not in the list yet. - New More/Less button, which doesn't quite work right (see below) - Changed icon for UI chrome - Enabled "turning on" and "turning off" media from the chrome and NMF - Added gear icon to bring up prefs - XUI changes to the structure of NMF - Implementation of the "tentative" autoplay flag This is basically a checkpoint so that Richard can help with the More/Less implementation
2010-02-09PARTIAL EXT-5261: add new "MediaTentativeAutoPlay" settingRick Pasetto
2010-02-09Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0Rick Pasetto
2010-02-08Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Monroe Linden
2010-02-08Fixed major bug EXT-5022 (streaming media first use dialog should be removed)Eugene Mutavchi
--HG-- branch : product-engine
2010-02-05Media classes + A step toward restructuring Nearby Media floaterRick Pasetto
Several changes here: - Implemented support for "media classification": see http://docs.google.com/a/lindenlab.com/View?id=ddznhrqn_29vhnr2pg8 - Added settings for auto-playing of said classifications Nearby Media Floater: - On/Off buttons are now explicit...no more power buttons - Parcel Media and Parcel Audio are "lighter weight", with no more on/off - List now sorts with playing items at top, non-playing below - There is now a "Show" drop-down that filters the list by classification - Added checkboxes to the bottom to control auto-play settings More work is needed, so consider this a checkpoint
2010-01-29Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Monroe Linden
2010-01-26Fix for EXT-4708 (ressing cursor or modifier keys while MoaP has input focus ↵Monroe Linden
gives an error in the log "WARNING: ll_apr_warn_status: APR: File exists") The attempt to create a directory should no longer be necessary with webkit. This code has been removed.
2010-01-25"Fix" confusion over media settingsRick Pasetto
Review #89 This implements the changes Sam wanted in order to reduce the confusion over media enabled-ness, in particular: - "Media Enabled" pref now only controls "AudioStreamingMedia" - No more "tentative" state - New "Music Enabled" pref - First run dialog controls Media and Music (Sam, this is a change from your request...I think it works better) - Put a reflection of the "Media Enabled" checkbox in the Nearby Media Floater - Get rid of the "AudioStreamingVideo" setting altogether (whatever used it, it should now obey "AudioStreamingMedia").
2010-01-21Partial fix for EXT-4508 (nearby media floater parcel media button breaks rtsp)Monroe Linden
This is actually two seperate issues: 1) After disabling parcel media from the nearby media floater, it can't be re-enabled 2) When you disable parcel media from the nearby media floater, faces displaying it don't revert to their original texture This change fixes issue (1), by forcing the priority of the inworld media instance to normal in LLViewerMedia::updateMedia() so it will always get reloaded instead of possibly being kept unloaded due to already-loaded prim media. Issue (2) is still under investigation. In addition to the case where you disable parcel media from the nearby media floater, it also doesn't restore the textures when you leave the parcel, and I think I've even seen it when unloading
2010-01-19FIX EXT-4172: encode all URLs navigated by the plugin APIRick Pasetto
2010-01-18Added getNativeKeyData() function to LLWindow and LLWindowMacOSX.Monroe Linden
Added an LLSD argument to LLPluginClassMedia::keyEvent() and LLPluginClassMedia::textInput() which contains the native key data. Made LLViewerMediaImpl retrieve the native key data and pass it to keyEvent and textInput. Added a native_key_data parameter to the text_event and key_event messages. Made the webkit plugin extract the native_key_data parameter and pass it to the internal keyEvent() and unicodeInput() functions. Fixed LLMediaPluginTest to match function signature change to LLPluginClassMedia::keyEvent().
2010-01-15mergerichard
2010-01-14Fix for EXT-4207 (Viewer crash clicking on an object that starts a script ↵Monroe Linden
that navigates in a while(1) loop) Don't allow LLViewerMediaImpl to process a navigateInternal during the call to LLPluginClassMedia::idle(). This prevents untimely destruction of the LLPluginClassMedia and LLPluginMessagePipe objects, which was causing the crash. Reviewed by Rick.
2010-01-14Automated merge with ssh://angela@hg.lindenlab.com/james/gooeyangela
2010-01-14EXT-3795 First run messages still display (click & drag on map, Build tools ↵angela
open, movement controlled, etc)
2010-01-11Fix for black/grey look at login screen and backspace going back in ↵Monroe Linden
search/help windows. This should address EXT-4097. Added a notion of "background color" to LLViewerMediaImpl and LLPluginClassMedia. Added background color parameters to the size_change message. Webkit plugin now sets the background color of the instance from the supplied background color, and navigates to a data: url with that background color instead of about:blank as its initial navigate. Webkit plugin now no longer waits for the first onPageChanged event LLViewerMediaImpl now clears the texture to the background color when initializing it. Made LLMediaCtrl fill with its opaque background color when the media impl isn't set up yet. Removed the initial data URL from the search and help floaters, since what it was doing is now handled internally by the new background color code. Reviewed by callum and rick.
2010-01-11Fix build issue with ba93e704bd4fRick Pasetto
2010-01-08Made AudioStreamingMedia setting control loading of prim media as well as ↵Monroe Linden
parcel media. Moved the media first-run dialog code from llviewerparcelmedia.cpp to llviewermedia.cpp, and made it come up for both prim and parcel media.
2010-01-06Fix for EXT-3730 (Current (temporary) Find URL returns an HTTP status code ↵Monroe Linden
of 500 (Internal server error)) We now no longer check the error code returned from the MIME type probe. If we have a mime type, use it, regardless of the status. If not, default to the web plugin and let it handle error reporting.
2010-01-05Lots of fixes to parcel audio playing/stopping/autoplaying/firstuse policy.Tofu Linden
2010-01-05Fix for EXT-3664/DEV-43374 (MEDIA SETTINGS Reset button does not work if ↵Monroe Linden
current URL is a quicktime movie) LLViewerMediaImpl::initializeMedia() was assuming an invalid invariant (that mMimeType was associated with the currently loaded plugin). Fixed by adding a new member variable, mCurrentMimeType, which reflects the MIME type that caused the currently loaded plugin to be loaded, and using that instead of mMimeType when determining whether to reload the plugin.
2009-12-29Fix for EXT-3758 (DEV-44584) - media will not display join.secondlife.comCallum Prentice
Reviewed by CB
2009-12-28Fix for EXT-3730 (HTTP response code of 500 from Find floater URL breaks it)callum
Reviewed by Sam
2009-12-17mergeRick Pasetto
2009-12-17Turned debug spam in LLViewerMedia::isInterestingEnough() down to lldebugs.Monroe Linden
2009-12-17Rearranged the handling of error status codes in LLMimeDiscoveryResponder. ↵Monroe Linden
We should now deal with many more classes of subtly misbehaving web servers, and will use the returned MIME type for 4xx errors instead of guessing text/html.
2009-12-17Quiet some logging, make sure if 1024 is lowest we still load itRick Pasetto