Commit Graph

146 Commits (bea2dfbc22bb2d80755dcf9daf810e1ea0329c2d)

Author SHA1 Message Date
Oz Linden f1a4593e47 merge changes for vmrg-204 2011-12-12 09:04:33 -05:00
Richard Linden c191f523a9 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-30 17:57:09 -08:00
Dave Parks 1da7f42224 merge 2011-11-29 12:10:14 -06:00
Richard Linden d089e6c264 bumped up MSVC warning level to 3 to catch more stuff that gcc catches 2011-11-28 19:16:49 -08:00
Brad Payne (Vir Linden) 5374e544ed merge 2011-11-28 10:13:34 -05:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
Leslie Linden abf39f7886 Greatly reduced the number of memcpy operations done on the media plug-in message output pipe
by removing 's = s.substr()' type operations.  The output string is now cleared via 's.clear()'
when its entire contents have been pumped and the beginning of the data is stored as an index
when necessary, rather than modifying the initial string.

Reviewed by davep.
2011-11-21 15:15:26 -08:00
Dave Parks 8a8e9ccdb6 SH-2652 Don't allocate 6000+ strings every frame 2011-11-04 16:15:05 -05: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
Richard Nelson 2154bccdc4 Automated merge with http://hg.secondlife.com/viewer-development 2011-08-31 11:51:38 -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 7ffc8b45e2 merge changes for storm-1564 2011-08-19 16:50:08 -04:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Richard Linden 9a9e78740a Automated merge with file:///e:\code\viewer-experience 2011-08-11 10:09:28 -07:00
Richard Linden 70a872c4a2 EXP-700 WIP SLPlugin(s) takes high CPU%
clamp maximum framerate of slplugin to 100Hz
also added assert to catch cases where we're requesting infinite framerate
2011-08-09 16:00:56 -07:00
Dave Parks f302e11962 merge 2011-08-08 15:33:55 -05:00
Xiaohong Bao 5e22062b68 fix for SH-2215: [crashhunters] crash at LLPluginClassMedia 2011-08-05 16:02:05 -06:00
Oz Linden 3369ebc8dd fix DOS line endings 2011-08-04 10:57:03 -04: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
Richard Linden 2595d53ded Automated merge with http://hg.secondlife.com/viewer-development 2011-05-25 18:14:55 -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 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
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
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
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Loren Shih 037a83cd47 Automated merge up from viewer-development into mesh-development 2011-03-16 14:54:56 -04:00
Richard Linden 11a0785ceb SOCIAL-595 FIX Global Volume control does not affect volume of MOAP in minimal skin on Windows
made slplugin.exe start with correct working directory (llplugin)
2011-03-01 15:03:26 -08:00
Xiaohong Bao 29415d1407 Merge 2011-02-23 13:48:35 -07:00
Loren Shih e3ed1565f8 Automated merge up from viewer-development into mesh-development 2011-02-10 10:44:21 -05:00
callum 7e6ce12a17 VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the current working
Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-08 15:37:12 -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
Loren Shih 5f99331f4a Automated merge up from viewer-development 2010-12-29 13:23:02 -05: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
Monroe Linden d275251138 SOCIAL-399 FIX Viewer crash when canceling http auth on a media prim
Reviewed by Callum at http://codereview.lindenlab.com/5636001
2010-12-20 16:33:25 -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 a991bd7f90 SOCIAL-311 FIX Media browser has too many oddities to be useful for viewer web apps
Completes MVP
2010-12-02 14:50:57 -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 a2420db5b3 SOCIAL-249 FIX pressing any of the Alt keys and 0-9 will output the number and symbol instead of just symbol
The issue seems to be Mac-only, so I've put the fix inside #if LL_DARWIN.  Windows' handling of ALT is very different, so the fix might not be appropriate there.
2010-12-01 16:40:40 -08:00
callum 1345cbb0ca SOCIAL-299 FIX Add *.lindenlab.com to trusted certificate authorities in WebKit
Reviewed by CB
2010-11-30 14:07:16 -08:00
Monroe Linden 9d82af29df SOCIAL-233 WIP Better performance (improve loading time of webkit instance)
The plugin system will now keep a spare running webkit plugin process around and use it when it needs a webkit instance.  This should hide some large portion of the setup time when creating a new webkit plugin (i.e. opening the search window, etc.)
2010-11-17 16:01:46 -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