summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit
AgeCommit message (Collapse)Author
2014-06-03All: Committing to llqtwebkit2 and the future. Updating all libraries.Monty Brandenberg
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-05-28All: Update library SDL to 290309, c-ares to 290089, boost to 290191,Monty Brandenberg
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-22Merge. Pull in viewer-release after release of 3.7.8Monty Brandenberg
2014-04-11Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.Monty Brandenberg
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.
2013-09-09merge with viewer-releaseRichard Linden
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-06-05merge with viewer-releaseRichard Linden
2013-05-13Merged with https://bitbucket.org/lindenlab/viewer-betaGeenz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-22merge with viewer-releaseRichard Linden
2013-02-22Merge new boost and add OS X 10.8 modsGraham Madarasz (Graham Linden)
2013-02-13Merge from viewer-betaprep
2013-02-06Merged with latest viewer-dev.Geenz
2013-01-29MAINT-2281: correct test for XP (corrected fix I applied incorrectly)Oz Linden
2013-01-29MAINT-2281: correct test for XPcallum_linden
2013-01-24Merged with latest viewer-dev.Geenz
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-11fix line endingscallum_linden
2013-01-11fix for mac buildsRichard Linden
2012-12-29Huge amount of refactoring to use Cocoa here:Geenz
- Updated to .xib format. To produce a new nib (which is required after changing the xib file), use "ibtool SecondLife.xib --compile SecondLife.nib" within the newview directory. - xib file now defines the viewer's window. VIews are still being pragmatically added to the main window. This may change in the future. - LLAppViewer's main loop has been slightly refactored to be executed on a timer for OS X. This probably needs a bit more work. - Event handling still needs more work to work within a timer based event loop. It works fairly sporadically at the moment, as if events are being dropped between timer executions, at least for the mouse. - Carbon has been purged from the viewer's startup, and from LLWindow entirely. There's likely still a few odds and ends fragmented throughout the viewer and its dependencies. Need to track these down. - LLAppViewerMacOSX now uses NSApplicationMain, and also implements the NSApplicationDelegate protocol in LLAppDelegate. - Fullscreen support has been implemented for OS X 10.7+ This is still a work in progress, however at this stage everything needed for a functional viewer is (mostly) complete. From here, it's mostly just bug hunting and fixing.
2012-12-18FIX (SPECULATIVE) MAINT-1340 - Media Volume control broken on Vista+ systemscallum_linden
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-04Removing server-related cmake cruft. Fixing libGLU warnings on linux.Don Kjer
2012-02-01converted a bunch of narrowing implicit conversions to explicitRichard Linden
2011-11-10Point to improved loading overlay and turn it on alwayscallum
2011-11-02Turn off debug loading overlay for older versions of LLQtWebKit thar do not ↵callum
support it (Linux)
2011-10-31Added more logging and elapsed time counter to log message.callum
2011-10-31Tie debugging/loading overlay to media debugging flagcallum
2011-10-28Merge with headcallum
2011-10-25EXP-1471 WIP Add support for zooming web pages by a scale facxtorcallum
2011-10-14Merge backout of b782a75c99e6Dave Parks
2011-10-14Backed out changeset b782a75c99e6Dave Parks
2011-09-12Removed windows line endings to conform to coding policy.Leslie Linden
2011-09-02Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-08-31MergeXiaohong Bao
2011-08-29EXP-1122 FIX (Viewer) LLQtWebKit should support a JavaScript/content ↵callum
debugger to help content creators Viewer side changes to enable Web debugger.
2011-08-26EXP-1111 FIX LLQtWebKit (and related media system) should log events, ↵callum
progress etc. to make debugging problems easier
2011-07-29Include some certs that were missed in the latest cert update. Specifically,Roxie Linden
paypal had a verisign -2 CA cert, and the new trust list only includes -3. Also, disable use of the system cert store. Just use our list.
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-06-09EXP-676 FIX As a web developer, I want to access information about the ↵callum
current state of the SL client, such as avatar location
2011-05-25Added support for pushing agent global location on grid and agent ↵callum
orientation out to LLQtWebKit
2011-05-18Reverted Linux LLQtWebKit to older version which triggered warnings here ↵callum
that are treated as errors.
2011-05-13EXP-676 FIX As a web developer, I want to access information about the ↵callum
current state of the SL client, such as avatar location
2011-03-28Automated merge with file:///F:\code\viewer-autobuild2010Richard Linden
2011-03-25SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking ↵callum
links in web profile Also fixes SOCIAL-521 and SOCIAL-428
2011-03-23Updated linux llqtwekit archive and fixed media webkit build and loading ↵alain@945battery-guestA-183.lindenlab.com
(fix CHOP-545).
2011-03-17SOCIAL-634 FIX Error condition content for Destination Guide, Avatar Picker,callum
and Help if S3 content or web content is not available. (Included refs to new LLQtWebKit that supports functionality)
2011-02-05Introduces a LLThreadLocalData class that can beAleric Inglewood
accessed through the static LLThread::tldata(). Currently this object contains two (public) thread-local objects: a LLAPRRootPool and a LLVolatileAPRPool. The first is the general memory pool used by this thread (and this thread alone), while the second is intended for short lived memory allocations (needed for APR). The advantages of not mixing those two is that the latter is used most frequently, and as a result of it's nature can be destroyed and reconstructed on a "regular" basis. This patch adds LLAPRPool (completely replacing the old one), which is a wrapper around apr_pool_t* and has complete thread-safity checking. Whenever an apr call requires memory for some resource, a memory pool in the form of an LLAPRPool object can be created with the same life-time as this resource; assuring clean up of the memory no sooner, but also not much later than the life-time of the resource that needs the memory. Many, many function calls and constructors had the pool parameter simply removed (it is no longer the concern of the developer, if you don't write code that actually does an libapr call then you are no longer bothered with memory pools at all). However, I kept the notion of short-lived and long-lived allocations alive (see my remark in the jira here: https://jira.secondlife.com/browse/STORM-864?focusedCommentId=235356&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-235356 which requires that the LLAPRFile API needs to allow the user to specify how long they think a file will stay open. By choosing 'short_lived' as default for the constructor that immediately opens a file, the number of instances where this needs to be specified is drastically reduced however (obviously, any automatic LLAPRFile is short lived). *** Addressed Boroondas remarks in https://codereview.secondlife.com/r/99/ regarding (doxygen) comments. This patch effectively only changes comments. Includes some 'merge' stuff that ended up in llvocache.cpp (while starting as a bug fix, now only resulting in a cleanup). *** Added comment 'The use of apr_pool_t is OK here'. Added this comment on every line where apr_pool_t is correctly being used. This should make it easier to spot (future) errors where someone started to use apr_pool_t; you can just grep all sources for 'apr_pool_t' and immediately see where it's being used while LLAPRPool should have been used. Note that merging this patch is very easy: If there are no other uses of apr_pool_t in the code (one grep) and it compiles, then it will work. *** Second Merge (needed to remove 'delete mCreationMutex' from LLImageDecodeThread::~LLImageDecodeThread). *** Added back #include <apr_pools.h>. Apparently that is needed on libapr version 1.2.8., the version used by Linden Lab, for calls to apr_queue_*. This is a bug in libapr (we also include <apr_queue.h>, that is fixed in (at least) 1.3.7. Note that 1.2.8 is VERY old. Even 1.3.x is old. *** License fixes (GPL -> LGPL). And typo in comments. Addresses merov's comments on the review board. *** Added Merov's compile fixes for windows.
2011-01-13mac buiding with autobuild and autobuild style packages (just say no to ↵Andrew A. de Laix
install.py)