Commit Graph

26 Commits (2df58f775fdd1c846ec125a9736d6dd39dab2811)

Author SHA1 Message Date
Geenz 3779e51bfc Merged with https://bitbucket.org/lindenlab/viewer-beta 2013-05-13 22:22:51 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz (Graham Linden) 98e02a5d76 Merge new boost and add OS X 10.8 mods 2013-02-22 09:49:58 -08:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Monroe Linden ce242821dc Added an "init" message in LLPLUGIN_MESSAGE_CLASS_MEDIA, and made 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-16 16:42:31 -07:00
Callum Prentice 9c608d4db5 Fix for DEV-45609 "CID-47 and CID-154 - bogus allocation/memset in Quicktime plugin"
(Fixed line endings for commit hook)
Reviewed by Rick.
2010-02-03 15:16:57 -08:00
Callum Prentice fea3e5ea76 Fix for DEV-45609 "CID-47 and CID-154 - bogus allocation/memset in Quicktime plugin"
Reviewed by Rick.
2010-02-03 15:13:19 -08:00
bea@american.lindenlab.com 8e3276ebf9 doxygen: exclude licensing comments 2009-11-30 14:53:31 -08:00
Bryan O'Sullivan 699eac4ee3 Switch some files to Unix line endings 2009-11-18 17:52:03 -08:00
Eric M. Tulla (BigPapi) 3217887356 Merge of viewer2 into avp
--HG--
branch : avatar-pipeline
2009-11-17 17:58:17 -05:00
James Cook ccc72757ef Fix comment-in-comment that was breaking Mac build. 2009-11-16 22:25:40 -08:00
callum 18980efe16 Fix up line endings issues. 2009-11-16 19:49:45 -08:00
callum ac9963ade2 Fix for - DEV-42713 (Playing MP3s crash the QuickTime plugin)
Note: This was fixed earlier in checkTitle() bosy and checked in by mistake.
This checkin re-enables the title grabbing code.
2009-11-16 19:22:45 -08:00
callum 18eab4a026 Merge with tip 2009-11-16 18:42:35 -08:00
Loren Shih 95cbf689f3 merge
--HG--
branch : avatar-pipeline
2009-11-16 11:05:33 -05:00
Loren Shih 59eb2815bf merge
--HG--
branch : avatar-pipeline
2009-11-13 18:28:27 -05:00
callum be72748d2a Fix for DEV-42152 (Streaming media broken on QuickTime) 2009-11-13 11:03:39 -08:00
Loren Shih 0dd9871012 merge
--HG--
branch : avatar-pipeline
2009-11-03 14:02:02 -05:00
Monroe Linden 8ae2f388b6 Fixes for DEV-41791 and DEV-41920.
Reworked some of the autoplay logic in LLViewerMediaImpl to try and make it more consistent when media is unloaded and reloaded by the performance manager.

LLViewerMediaImpl will now keep track of the media state and current time of media that it unloads for performance reasons, and attempt to restore playing or paused media to the same playhead time and state (playing or paused) when it reloads.

Added "done" status that time-based media plugins can use to indicate that they've reached the end of the media and stopped.

Added logging of priority transitions, for use in debugging issues with the peformance manager.
2009-10-28 17:34:03 -07:00
Monroe Linden 4767b546e6 Fix for DEV-41638 (current URL is not propagated if media changes from website to media).
Made the quicktime plugin send navigate_begin and navigate_complete events.

This should allow the viewer's logic for sending prim media navigate events to work when loading quicktime media.
2009-10-26 17:59:45 -07:00
callum 113053b504 Fixed defects - added back getLoadedDuration() code that mysteriously vanished and fix name of function that checks the title.
See http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=19
2009-10-15 15:08:10 -07:00
callum 4347096803 https://jira.lindenlab.com/jira/browse/DEV-40711
Implement name fetching capabilities for Webkit and Quicktime plugins
Adds support for new PluginAPI message (MEDIA_EVENT_NAME_CHANGED) that updates the "title" of the media. In WebKit plugin this is the contents of the <title> tag. In The QuickTime plugin it is the "display name" from the movie meta data
2009-10-15 11:26:52 -07:00
Monroe Linden d02906b12e Added an optional "loaded_duration" parameter to the 'updated' message. This is the duration through which the time-based media has loaded, and should be between zero and the value of the "duration" parameter. If the parameter is not supplied, it will be implicitly set to the same value as the "duration" parameter, so the movie will appear fully loaded. This can be queried with LLPluginClassMedia::getLoadedDuration().
Made the "loaded_duration" parameter also implicitly set the progress percentage and send out MEDIA_EVENT_PROGRESS_UPDATED messages when it changes.

Made the quicktime plugin set the "loaded_duration" parameter in its update messages.
2009-10-12 17:21:26 -07:00
Monroe Williams cf9239cabc svn merge -r 134922:134973 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-10-01 02:35:53 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 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.
2009-08-27 19:00:18 +00:00