Commit Graph

39 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 0ba9a00c31 SH-3468 WIP add memory tracking base class
cleaned up hacks used to get unit tests working
LLTrace::init now supports recursive initialization/cleanup
put NOMINMAX back in win32 header wrappers
2013-01-08 23:50:27 -08:00
Richard Linden 2f91ffb45c SH-3406 WIP convert fast timers to lltrace system
fixed Windows build problem (NOMINMAX redefinition)
2013-01-08 17:48:47 -08:00
Oz Linden 0656620e2d merge changes for storm-1187 2011-04-22 11:49:41 -04:00
Merov Linden 505e5e403d EXP-681 : Add MEDIA_EVENT_NAVIGATE_ERROR_PAGE case in LLMediaPluginTest so to pass build on Mac 2011-04-12 16:06:24 -07:00
Monty Brandenberg 2399b2fca1 Fix gcc 4.2 warning about incomplete case coverage in switch
statement for plugin events.  This becomes an error in the build
so I'm adding a default: case to cover the enumeration.
2011-04-12 18:11:28 -04:00
callum 0ea1b472c6 Additional fix for llmediaplugintest compilation failure after fix for VWR-21275 2011-02-09 10:12:20 -08:00
callum 88eabbd077 SOCIAL-311 PARTIAL FIX (2) Media browser has too many oddities to be useful for viewer web apps
Latest traunch of fixes to new Web only content floater
Also removed line in test app that fails to build - have a note to fix later
2010-12-01 19:02:53 -08:00
Monroe Linden 880110eb93 OCIAL-231 FIX Enable tooltips (for links and images)
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.
2010-12-01 18:15:59 -08:00
Monroe Linden df8b87435f SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1
Added support to the webkit media plugin and llpluginclassmedia for passing through the auth request/response.  We still need an updated build of llqtwebkit for all platforms, as well as some UI work in the viewer to actually display the auth dialog.
2010-11-16 17:01:44 -08:00
Monroe Linden 568496eb32 Fixed some build errors in llmediaplugintest.cpp.
Reviewed by Richard.
2010-09-23 16:30:30 -07:00
Monroe Linden 531b77a948 Enable web popups to specify size and position of the Media Browser window 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-09-15 14:39:42 -07:00
Monroe Linden 24f308caae Added support for a media plugin message that asks the viewer to open a file picker on the plugin's behalf.
Reviewed by Callum.
2010-09-10 16:43:35 -07:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Monroe Linden a2657be578 Viewer side changes to support javascript window.close handling. 2010-08-17 17:56:54 -07:00
Monroe Linden 4e8c33e725 Added support for targeted links opening new windows to llmediaplugintest. 2010-08-10 13:04:01 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Monroe Linden dacc5afbf0 Architectural changes to LLPlugin message processing.
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-27 17:25:01 -07:00
Loren Shih b1b5a11bb0 EXT-3075 : Remove swear words from comments across viewer
This bugs me in a minor way.  Did a search-and-cleanup on various swear words.
2010-03-29 15:33:48 -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
Nat Goodspeed 65ecde210e Fix Mac llmediaplugintest build breakage.
A viewport array passed to glGetIntegerv() and gluUnProject() was declared as
'int'. This compiles on Windows, but fails on Mac. Declaring as 'GLint' works.
2010-03-05 16:29:37 -05:00
Callum Prentice 34c8f6f7fa Changes to plugin test app in preparation for work on positional per-process audio for media.
Not part of the client and nothing here is deployed - internal testing only.
2010-03-04 14:32:24 -08:00
Monroe Linden fae9c8fe86 Added getNativeKeyData() function to LLWindow and LLWindowMacOSX.
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-18 17:58:12 -08:00
Nat Goodspeed 466a8d2664 Fix llmediaplugintest.cpp for non-Windows platforms 2009-12-10 14:10:10 -05:00
Tofu Linden 9abe779c8a last blind fixup for llmediaplugintest. 2009-12-09 14:55:45 -08:00
Tofu Linden 9b0825be5c get llmediaplugintest compiling on win32, dumbly. 2009-12-09 14:48:36 -08:00
Tofu Linden 204ae550d8 blindly fix-up llmediaplugintest.cpp with respect to the recent API change. 2009-12-09 13:59:51 -08:00
callum f693e70c24 Restore a minor change to the media test mule that was checked in by mistake 2009-11-16 19:47:35 -08:00
callum 18eab4a026 Merge with tip 2009-11-16 18:42:35 -08:00
callum 91b54876b7 Adds an example plugin and corresponding changes to
LLMediaPluginTest test app. We do not copy over the
example plugin to the Second Life client plugin dir.
2009-10-30 10:48:10 -07:00
callum d8ed8489b0 Fixed up mouseEvent function to reflect mouse button 2009-10-26 09:27:56 -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 f154a3a23f Changed llmediaplugintest into a bundled app on the mac, to solve some issues around the newly-dynamic libllcommon.dylib. This includes making it set the current working directory to a known location inside its bundle on launch.
Changed indra/test_apps/llplugintest/CMakeLists.txt to copy various bits now needed inside the app bundle on the mac.
2009-10-12 19:47:39 -07:00
Monroe Linden 374deb8da1 Fixes for a different class of plugin failures (where loading the plugin dll fails) causing an error message loop:
Made LLPluginProcessParent differentiate between failures launching/loading the plugin and failures after the plugin has been loaded.  This allows us to handle launch failures differently, since retrying is unlikely to fix them.

Added new media event MEDIA_EVENT_PLUGIN_FAILED_LAUNCH to indicate a launch failure.

Added a case for the new event to LLViewerMediaImpl::handleMediaEvent() that sets the "failed init" flag to prevent retries.
2009-10-05 15:48:00 -07:00
Brian McGroarty ae6c3d7d6c build issue - const invariance in llplugintest/llmediaplugintest 2009-09-03 02:57:14 +00:00
Sam Kolb 410e2228fd Removed some final dependencies to Awesomium and Flash ActiveX (mostly porting over Callum's change: r132166)
DEV-39138 build process on parabuild fails due to missing flash activex plugin
2009-08-31 23:08:06 +00:00
Adam Moss 158946668a svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31 17:16:21 +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