summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
AgeCommit message (Collapse)Author
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-06Fixes for EXT-8563 "VWR-20156: Prim Media on HUDs has no Audio or Interactivity"Monroe Linden
Backed out changeset 1b65d0d42c67 (the fix for EXT-5205), and replaced it with a check in LLPanelPrimMediaControls::nextZoomLevel(). Made LLViewerMediaImpl::calculateInterest() not attempt to calculate distances to HUD attachments, since their global positions are invalid.
2010-06-25EXT-8039 - further fix to allow mac/linux to build properlyKent Quirk
2010-06-15Fix for EXT-7414 (Jumping to a specific time in a video stream does not work ↵Monroe Linden
in Viewer 2.) This was a race condition. In the repro case, LLViewerMediaImpl::seek() was getting called before the media source got a chance to be loaded (since the load is now delayed at least 1 frame due to the priority calculations), so the seek command was being dropped. The fix is to save the seek time in mPreviousMediaTime in this case, and rearrange the code in LLViewerMediaImpl::loadURI() so that it gets used whenever it's non-zero. I've also added similar code in LLViewerMediaImpl::pause() and LLViewerMediaImpl::start() to set mPreviousMediaState. (If there are any cases where content wants parcel media to start out paused, they would have had a similar issue.) Reviewed by Callum and Richard at http://codereview.lindenlab.com/2478002 .
2010-05-27VI-49 FIX "_external" links should work in shared mediaRichard Linden
monroe already did most of this, just moved dialog for confirming opening external browser to common code that calls out to external browser so no way to skip notification unless the user opts out
2010-05-25mergeRichard Linden
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-05-20tweaked media attenuation to better match object sound attenuationRichard Linden
2010-05-11converted media volume falloff to proper 1/x^2 functionRichard Linden
reviewed by leyla
2010-04-30Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-04-30MergeLeyla Farazha
2010-04-30updated media attenuation functionLeyla Farazha
reviewed by Richard
2010-04-30Added min and max for media sound attenuationLeyla Farazha
reviewed by Richard
2010-04-29add debug code for EXT-7011: crash at LLPluginClassMedia::idle ↵Xiaohong Bao
[secondlife-bin llpluginclassmedia.cpp:158]
2010-04-29Incorporate suggestions from Richard's review of the LLPlugin changes.Monroe Linden
Use LLMutexLock (stack-based locker/unlocker) for the straightforward cases instead of explicit lock()/unlock(). There are still a couple of cases (one overlapping lock lifetime and two loops that unlock the mutex to call another function inside the loop) where I'm leaving explicit lock/unlock calls. Rename LLPluginProcessParent::sPollThread to sReadThread, for consistency. Made the LLPluginProcessParent destructor hold mIncomingQueueMutex while removing the instance from the global list -- this should prevent a possible race condition in LLPluginProcessParent::poll(). Removed a redundant check when calling LLPluginProcessParent::setUseReadThread().
2010-04-28Media sound attentuation first passLeyla Farazha
reviewed by Richard
2010-04-27Architectural changes to LLPlugin message processing.Monroe Linden
LLPluginProcessParent can now optionally use a separate thread for reading messages from plugin sockets. If this is enabled, it will spawn a single thread and use apr_pollset_poll to wake up the thread when incoming data arrives instead of polling all the descriptors round-robin every frame. This should be somewhat more efficient, and should also allow blocking requests from plugins to be serviced much more quickly (once we start using them). This is currently disabled by default, until it's had a bit more focused testing on multiple platforms. Hooked up the switch to use the message read thread to the PluginUseReadThread debug setting and an item in the Advanced menu in the viewer, and to a checkbox in the UI in llmediaplugintest. Updated some debug logging in the plugin system to have appropriate tags and not log dire-looking warnings during normal operation. LLPluginProcessParent now once again explicitly kills plugin processes (instead of just closing their sockets and waiting for them to exit). The problem we were attempting to solve by not doing the kill (letting the webkit plugin write its cookie file on exit) has been solved another way. LLPluginProcessParent::sendMessage() now attempts to write the outgoing message to the socket immediately instead of waiting for the next frame. This should reduce the latency of sending plugin messages. Added a separate fast timer for LLViewerMedia::updateMedia().
2010-04-20Fixed EXT-6542(normal) - [HARD CODED] - Land-Info, Medien: none/none needs ↵Dmitry Zaporozhan
to be localized Added "DefaultMimeType" string to strings.xml to make "none/none" mime type localizable. Replaced all occurrences of "none/none" string with call to static method. Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/265/ --HG-- branch : product-engine
2010-04-14Fix for incorrect handling of an OpenID url containing a port numberMonroe Linden
The code was using the "authority" part of the URL returned by LLURL when constructing the cookie's domain, which incorrectly included the port number. This change makes sure any port number and username/password that might be in the authority are stripped from the string before handing it to the cookie code. Reviewed by Gino at http://codereview.lindenlab.com/1297006
2010-04-14merge from viewer-hotfixTofu Linden
2010-04-13Fix for EXT-6750 (disabled attachment media still plays).Monroe Linden
LLViewerMediaImpl::shouldShowBasedOnClass() was always returning true for focused media. This was incorrect, since it made click-focusing on media override the class-based disable preferences. Reviewed by Callum at http://codereview.lindenlab.com/1178023
2010-04-02Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-04-02add some debug code for EXT-5394: Crash in ↵Xiaohong Bao
LLViewerMediaImpl::calculateInterest()
2010-04-01EXT-3531 - Ctrl-p doesn't work reliably on loginRichard Linden
moved gEditMenuHandler handling to LLEditMenuHandler destructor
2010-04-01Checker: CHECKED_RETURNTofu Linden
Function: LLViewerMediaImpl::createMediaSource() File: /indra/newview/llviewermedia.cpp
2010-03-31Enable OpenID auth in the embedded webkit browser.Monroe Linden
Extract openid_url and openid_token tokens from the login response in process_login_success_response() and send them to LLViewerMedia if they're present. Added LLViewerMedia::openIDSetup() to receive openid_url and openid_token, and added code to LLViewerMedia to do a POST with LLHTTPClient, retrieve the resulting cookie, and push it into the central cookie store. Also made sure the OpenID cookie gets re-added when the cookie store is cleared. Added LLPluginCookieStore::setCookiesFromHost() to properly add a cookie that may not have a domain set. Made LLPluginCookieStore::Cookie::parse() add missing domain and path fields to cookies as necessary. Fixed an issue where carriage returns in the string passed to LLPluginCookieStore::setCookies() or LLPluginCookieStore::setCookiesFromHost() would cause a parse failure. Reviewed by gino and callum at http://codereview.lindenlab.com/1254001
2010-03-29MergeLoren Shih
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-26Fix "clear cookies" not clearing cookies in some casesMonroe Linden
LLViewerMedia::clearAllCookies was sending "clear cookies" messages to all plugins and deleting cookie files, but it wasn't clearing the cookies in the central store. It now does all of the above.
2010-03-26Fix a couple of minor issues with the central cookie storage code.Monroe Linden
Made LLViewerMedia::clearAllCookies() delete the new per-user cookie file (userdir/plugin_cookies.txt) as well as the old one. Made LLViewerMedia::loadCookieFile() send the clear_cookies message to all loaded plugins.
2010-03-26Implemented central storage mechanism for media plugin cookies.Monroe Linden
Added LLPluginCookieStore, which manages the central list of cookies. New Mac and Windows versions of llqtwebkit, built from the tip of the cookie-api branch on http://bitbucket.org/lindenlab/llqtwebkit/ (currently revision f35a5eab8c2f). Added "set_cookies" and "cookie_set" messages to the media_browser message class in the plugin API, and made the webkit plugin use them appropriately. Added methods to LLViewerMedia to read/write the cookie file and add/remove individual cookies. Added hooks to read/write the cookie file (plugin_cookies.txt) in the same places as the location history (idle_startup() in llstartup.cpp and LLAppViewer::cleanup(), respectively). Reviewed by Richard at http://codereview.lindenlab.com/1006003
2010-04-02add some debug code for EXT-5394: Crash in ↵Xiaohong Bao
LLViewerMediaImpl::calculateInterest()
2010-03-19Merge with tipCallum Prentice
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-18EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature to ↵Callum Prentice
disable Web plugins via prefs" and EXT-6401 "Add feature to disable Javascript via prefs" Apologies for the multiple commit of Jiras - these changes are closely related and impossible to commit deparately Reviewed by Monroe
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