summaryrefslogtreecommitdiff
path: root/indra/media_plugins
AgeCommit message (Collapse)Author
2013-06-05Unwind cruft from hunting for 2707 they won't end up in vwr-dev-matGraham Madarasz
2013-06-04BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid ↵Graham Madarasz
throwing unhandlable exceptions in coroutines in RelWithDebInfo builds
2013-06-03BUG-2707 disable sites calling OsOutputDebugString directly to identify ↵Graham Madarasz
which is tossing our errant exception
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-02-13Merge from viewer-betaprep
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-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
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-08-17fix files that do not end with a newline (warn-on-failure:copyright because ↵Oz Linden
some have both problems...)
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-04-20merge changes for storm-1088Oz Linden
2011-04-17STORM-1088: corrected fix loading of winmm.dllSiana Gearz
2011-04-17STORM-1088: fix loading of winmm.dllSiana Gearz
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-18MergeRichard Linden
2011-03-18merge out 2.6.0 changes from viewer-developmentOz Linden
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-03-15eol fixesRichard Linden
2011-03-03SOCIAL-641 FIX C++ Runtime error in SLvoice.exe when launching Standard Skin ↵Richard Linden
on Windows
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)
2010-12-23Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-exportOz Linden
2010-12-21SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7Monroe Linden
Reviewed by Callum
2010-12-15VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit.Aleric Inglewood
If Qt and/or llqtwebkit is found in a non-standard place, you still have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running the viewer of course (or the webkit plugin will silently fail).