Commit Graph

77 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
callum_linden fc94872693 Update to build on Xcode 6.0 (fix unit tests): fix and remove copy-pasted code :( 2014-10-22 09:43:55 -07:00
JJ Linden 5cb5c267ca fixes for cmake warnings about policy changes. could not fully test these changes 2014-10-13 12:46:55 -07:00
Monty Brandenberg 5b542e227b All: Committing to llqtwebkit2 and the future. Updating all libraries.
Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom
to 290576, curl to 290567, fontconfig to 290569, freetype to 290557,
google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit
to 290578, openssl to 290560, PCRE to 290406, zlib to 290556.  Document
compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake.  It
is the README for the building process based on things learned during
this library project.  Switch building process back to style used for
new llqtwebkit2 repo.  This builds shared libraries for Qt4 products
on all platforms using current build machines and TC task templates.
All platforms are building.  All have comparable FPS rates.  Builds are
getting quieter.  Forward, comrades!
2014-06-03 19:37:58 -04:00
Monty Brandenberg 403ec62e3c All: Update library SDL to 290309, c-ares to 290089, boost to 290191,
colladadom to 290229, curl to 290186, fontconfig to 290258, freetype to 290255,
google-mock/gmock/gtest to 290199, libpng to 290081, libxml2 to 290157,
llqtwebkit to 290262/250147 (to be fixed shortly), openssl to 290083,
pcre to 290150, zlib to 290080.  The freetype2 headers are now normalized
to what they would normally be on a unix-type system.  Libxml2 and
pcre are available on all platforms.  Libraries generally move in the
direction of static archives rather than shared libraries (e.g. openssl).
The llqtwebkit side is a step back from the more ambitious goal.  What
will be used (290262) will be a simple rebuild of the existing 4.7.1
library with updated package dependencies.  The bigger work will be in
the future.
2014-05-28 19:40:45 +00:00
Monty Brandenberg 060c728970 Merge. Pull in viewer-release after release of 3.7.8 2014-05-22 22:08:54 +00:00
Monty Brandenberg 04404b68b5 All/Mac: Update libraries to new template builds. Package for static libz/libpng/openssl.
Update library dependencies to reference builds using new templates and
modern build hosts for:  SDL, c-ares, boost, curl, libpng, llqtwebkit2,
openssl and zlib.  Update manifest, library copying and 'test_apps' setup
to reflect that zlib and openssl are now always static (on Mac and
Linux).  Viewer and test_apps now functional on 10.7 Mac.
2014-04-14 17:59:00 -04:00
Monty Brandenberg e72d546fe3 Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.
Part of the switchover to dynamic Qt4.  This mostly completes the
Mac side.  Webkit is functional on Mac, plugins work.  The two
test programs, llfbconnectest and llplugintest, need a little
more work to run without manual fixup ('.' on PATH and maybe a
symlink to libz.1.dylib and they run and function on Mac).  Also
need to address libz.dylib vs libz.a.  Currently resolving against
dylib which is not what I want.
2014-04-11 19:19:22 -04:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Merov Linden 1c740dfb51 Pull merge from viewer-release 2013-05-22 14:21:49 -07:00
Merov Linden 2a7d604e87 ACME-306 : Pull merge from viewer-chui 2013-05-02 17:37:29 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Cho 676838ac58 ACME-72 FIX Streamline Webkit test app for FB Connect testing
Enabled cookies by default and set starting URL to https://cryptic-ridge-1632.herokuapp.com/
2013-02-23 01:05:00 +00:00
Cho a7f1abded2 added llfbconnecttest thanks to callum 2013-02-21 00:41:55 +00: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
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Don Kjer c9ab9590aa Removing server-related cmake cruft. Fixing libGLU warnings on linux. 2012-10-04 03:12:48 +00: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
Oz Linden 64c07135ba merge up from viewer-development 2011-03-03 07:20:04 -05:00
Merov Linden f86e112556 STORM-977 : pull into viewer-development 2011-03-01 11:50:12 -08:00
Jonathan Yap 55b0c6d6a7 STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used 2011-02-16 14:29:23 -05:00
callum 0ea1b472c6 Additional fix for llmediaplugintest compilation failure after fix for VWR-21275 2011-02-09 10:12:20 -08:00
Jonathan Yap 333a9b3f97 STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used 2011-02-09 10:52:12 -05:00
Oz Linden ee2aebfaf3 merge up to lastest upstream 2011-02-11 12:54:12 -05:00
Alain Linden 738c754608 windows autobuildibatized (bye bye install.py...) 2011-01-14 09:03:22 -08:00
Andrew A. de Laix b7637e58be mac buiding with autobuild and autobuild style packages (just say no to install.py) 2011-01-13 13:09:27 -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
Monroe Linden ec0a2b9849 The movie URLs we were using on movies.apple.com now need to be accessed as trailers.apple.com instead. 2010-03-16 16:16:04 -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
callum b910de4ad7 Client changes to pick up new version of Qt 4.6 with codecs for default text encoding. 2009-12-18 18:44:43 -08:00
callum b7747a815f Merge with tip before push 2009-12-15 17:53:03 -08:00
callum f923f896bc client changes to work with new version of Qt (4.6) and to do some cleanup at plugin exit so that cookies more betterer than what they did before. 2009-12-15 17:50:16 -08:00