Commit Graph

214 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
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
prep 11d12f1a99 Merge from viewer-beta 2013-02-13 11:30:36 -05:00
Oz Linden 2fa8205d4d MAINT-2281: correct test for XP (corrected fix I applied incorrectly) 2013-01-29 18:39:51 -05:00
callum_linden 276800e6f2 MAINT-2281: correct test for XP 2013-01-29 18:09:13 -05:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
callum_linden 90fb925d84 fix line endings 2013-01-11 15:23:18 -08:00
callum_linden 88fe6da622 FIX (SPECULATIVE) MAINT-1340 - Media Volume control broken on Vista+ systems 2012-12-18 11:44:20 -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
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
callum 2a19aa93e9 Point to improved loading overlay and turn it on always 2011-11-10 19:00:03 -08:00
callum 91354304fc Turn off debug loading overlay for older versions of LLQtWebKit thar do not support it (Linux) 2011-11-02 15:05:55 -07:00
callum 2777ddd060 Added more logging and elapsed time counter to log message. 2011-10-31 15:35:04 -07:00
callum 9399b66dc4 Tie debugging/loading overlay to media debugging flag 2011-10-31 11:33:41 -07:00
callum b94f45db81 Merge with head 2011-10-28 11:01:11 -07:00
callum 343562889e EXP-1471 WIP Add support for zooming web pages by a scale facxtor 2011-10-25 19:34:05 -07:00
Dave Parks c0ca8e5e2e Merge backout of b782a75c99e6 2011-10-14 11:58:35 -05:00
Dave Parks 4331c112ab Backed out changeset b782a75c99e6 2011-10-14 11:52:40 -05:00
Leslie Linden 1c57963673 Removed windows line endings to conform to coding policy. 2011-09-12 11:30:24 -07:00
Richard Linden fc45e9cbf6 Automated merge with http://hg.secondlife.com/viewer-development 2011-09-02 20:24:06 -07:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
callum d341c400fc EXP-1122 FIX (Viewer) LLQtWebKit should support a JavaScript/content debugger to help content creators
Viewer side changes to enable Web debugger.
2011-08-29 17:13:29 -07:00
callum 0bf3ee7fa7 EXP-1111 FIX LLQtWebKit (and related media system) should log events, progress etc. to make debugging problems easier 2011-08-26 17:27:15 -07:00
Oz Linden 43fd5ef807 fix files that do not end with a newline (warn-on-failure:copyright because some have both problems...) 2011-08-17 12:42:37 -04:00
Roxie Linden 468d810486 Include some certs that were missed in the latest cert update. Specifically,
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-29 19:48:52 -07:00
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
callum 7847c8941f EXP-676 FIX As a web developer, I want to access information about the current state of the SL client, such as avatar location 2011-06-09 13:48:35 -07:00
callum e9f8a5441b Added support for pushing agent global location on grid and agent orientation out to LLQtWebKit 2011-05-25 08:10:04 -07:00
callum e5e98a597d Reverted Linux LLQtWebKit to older version which triggered warnings here that are treated as errors. 2011-05-18 09:56:02 -07:00
callum e4a9704d41 EXP-676 FIX As a web developer, I want to access information about the current state of the SL client, such as avatar location 2011-05-13 17:08:43 -07:00
Oz Linden 252cb50c38 merge changes for storm-1088 2011-04-20 20:21:55 -04:00
Siana Gearz d1ba34a8ad STORM-1088: corrected fix loading of winmm.dll 2011-04-17 11:25:00 -04:00
Siana Gearz 26b15973af STORM-1088: fix loading of winmm.dll 2011-04-17 08:04:02 -04:00
Richard Linden 84b179b0bf Automated merge with file:///F:\code\viewer-autobuild2010 2011-03-28 17:38:54 -07:00
callum b286a9091b SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking links in web profile
Also fixes SOCIAL-521 and SOCIAL-428
2011-03-25 13:56:14 -07:00
alain@945battery-guestA-183.lindenlab.com 616b0a2568 Updated linux llqtwekit archive and fixed media webkit build and loading (fix CHOP-545). 2011-03-23 10:44:39 -07:00
Richard Linden e5a4b145b4 Merge 2011-03-18 11:41:27 -07:00
Oz Linden 7e3c32308c merge out 2.6.0 changes from viewer-development 2011-03-18 08:08:12 -04:00
callum b3e444c74e SOCIAL-634 FIX Error condition content for Destination Guide, Avatar Picker,
and Help if S3 content or web content is not available.
(Included refs to new LLQtWebKit that supports functionality)
2011-03-17 17:18:58 -07:00
Richard Linden a024493c04 eol fixes 2011-03-15 13:36:23 -07:00
Richard Linden 2740879205 SOCIAL-641 FIX C++ Runtime error in SLvoice.exe when launching Standard Skin on Windows 2011-03-03 21:02:09 -08:00
Aleric Inglewood ef490e308c Introduces a LLThreadLocalData class that can be
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-02-05 15:58:07 +01: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
Oz Linden 5a4bb72b8d Automated merge with ssh://bitbucket.org/aleric/viewer-development-aleric-export 2010-12-23 19:41:44 -05:00
Monroe Linden 5d6ccc5cde SOCIAL-374 FIX Avatar images not loading on join.secondlife.com in Webkit 4.7
Reviewed by Callum
2010-12-21 16:38:06 -08:00
Aleric Inglewood d0a25a4184 VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit.
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).
2010-12-15 20:12:17 +01:00
callum 1c946e8e4d SOCIAL-318 FIX Example plugin doesn't render anything 2010-12-03 10:34:54 -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