Commit Graph

163 Commits (c104c887c5c3d4e8c84b9d028bb4123701228551)

Author SHA1 Message Date
Richard Linden 2ed1de224a Automated merge with http://hg.secondlife.com/viewer-development 2012-02-06 15:28:45 -08:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Xiaohong Bao f082de03ff fix for SH-2845, SH-2846, SH-2847, SH-2851: curl crashes and out-of-memory crashes. 2012-01-12 16:36:56 -07:00
Dave Parks cfb666e9d9 merge 2011-11-15 17:04:37 -06:00
Brad Payne (Vir Linden) 1f17228145 merge 2011-10-18 16:24:23 -04:00
Brad Payne (Vir Linden) 47a4ce19c7 SH-2515 WIP - changed app name in linux updater, dir name in windows installer 2011-09-30 13:16:29 -04:00
Brad Payne (Vir Linden) 41d9ad5cd3 SH-2515 WIP - changed app name in mac-updater 2011-09-30 11:06:12 -04:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
Nat Goodspeed 7a7a0f0c1b EXP-772: If URIs returned by SRV fail, fall back on original URI. 2011-05-26 17:25:26 -04:00
Dave Parks 8a92612fd9 merge 2011-05-16 12:34:15 -05:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
Seth ProductEngine e213a36f70 STORM-477 Restored the backed out changeset: b62b260aa04d 2011-05-11 18:12:23 +03:00
Nat Goodspeed 343ffb9d51 Remove Pth library from viewer build.
This library was only needed on the Mac, and only with the OS X 10.4 SDK. As
of October 2010, we no longer build the viewer with that SDK. The 10.5 SDK
we're currently using directly supports the functionality for which we
originally brought in Pth.
2011-05-05 19:23:55 -04: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 fbc6e5d639 Automated merge up from viewer-development into mesh-development 2011-02-01 11:28:22 -05:00
Oz Linden f0074f1002 merge changes back from beta branch 2011-02-01 07:22:32 -05:00
Andrew A. de Laix 9fa947ef74 a less brain dead fix for CHOP-369 2011-01-24 14:58:10 -08:00
Andrew A. de Laix 14042f631d fix CHOP-369: catch case of synchronous download failure. 2011-01-24 10:54:08 -08:00
Loren Shih 38f4bad925 Automated merge up from viewer-development 2011-01-21 10:36:29 -05:00
Oz Linden 4f3953763d merge changes from viewer-beta 2011-01-20 20:48:16 -05:00
Andrew A. de Laix 8e4d6bb1ac fix CHOP-366, on temporary errors (e.g. version manager returns other than 200) show error dialog instructing the user to manually install the latest viewer. 2011-01-14 12:59:42 -08:00
Merov Linden 804495ad41 STORM-477 : backout changeset 6f5cb303d3e2 2011-01-13 11:15:47 -08:00
Seth ProductEngine 4af9db7b79 STORM-477 FIXED Re-implemented LLDir::getNextFileInDir() as an iterator object.
- Replaced all existing usages of LLDir::getNextFileInDir() with the new directory iterator object.
- Removed platform specific LLDir::getNextFileInDir() implementation.
2011-01-11 19:50:58 +02:00
Loren Shih fdf19a5268 Automated merge up from viewer-development 2011-01-10 11:20:39 -05:00
Oz Linden a4d5e38535 STORM-826 (workaround): correct mixed and dos-style line endings 2011-01-06 11:06:20 -05:00
Loren Shih 5f99331f4a Automated merge up from viewer-development 2010-12-29 13:23:02 -05:00
Andrew A. de Laix 2c68cb2c69 fix windows build? 2010-12-20 10:38:36 -08:00
brad kittenbrink f95effdacf Better fix for CHOP-286 - reenabled bandwidth limits on linux now that we've fixed the freeze. 2010-12-17 15:59:51 -08:00
brad kittenbrink 63dec2a9b9 Temporary workaround for CHOP-286: bandwidth limits freeze the downloader thread on linux 2010-12-17 14:26:55 -08:00
Andrew A. de Laix 3c3c9a0d49 Automated merge with https://bitbucket.org/mani_linden/viewer-development 2010-12-17 12:07:22 -08:00
Andrew A. de Laix 67a543aa6c ich bin stupid; this should actually fix the windows build. 2010-12-17 12:07:09 -08:00
Andrew A. de Laix 6a6757cab4 don't rely on stream cast to bool behavior; use explicit fail call. 2010-12-17 11:35:26 -08:00
Andrew A. de Laix 049815bd52 and don't break other builds. 2010-12-17 10:55:09 -08:00
Andrew A. de Laix b707048fdf fix windows build (suppress warning from lexical_cast) 2010-12-17 10:53:02 -08:00
Andrew A. de Laix 1774489ef8 Vary install failed message depending on whether it was required or not. 2010-12-16 09:34:19 -08:00
Loren Shih ee0055f5af Automated merge up from viewer-development 2010-12-16 11:12:15 -05:00
Oz Linden 33f745b237 pulling fixes back from viewer-beta 2010-12-15 10:12:49 -05:00
brad kittenbrink 3641d012e3 Merge 2010-12-14 16:19:20 -08:00
Andrew A. de Laix 5b5d2c428c Record update version in download marker so it can be recalled if resumed in another viewer session. 2010-12-14 09:54:28 -08:00
brad kittenbrink 4f9e6ff2ff Defensive coding for linux updater script for consistency with alain's work on the mac script.
Should be safer if the user is installing to a path with spaces in it.
2010-12-10 17:27:17 -08:00
Andrew A. de Laix ac2253abc4 fix quoting in script to work with spaces in directory names. 2010-12-10 16:11:16 -08:00
Andrew A. de Laix 8ab943f470 fix working directory in install script and remove dependency on open option --args which is 10.6 only. Also fix erroneous check in process launcher which was mistakenly reporting a failed execution of the new updater script. 2010-12-10 15:41:14 -08:00
Andrew A. de Laix 1924f1bbca no bandwidth limit for required downloads. 2010-12-10 11:26:23 -08:00
Andrew A. de Laix b89b41991e ui improvements to more closely match UX design. 2010-12-10 09:43:01 -08:00
Andrew A. de Laix 3c3683b884 limit dowload bandwidth to 'Maximum bandwidth' setting 2010-12-07 15:41:31 -08:00
Andrew A. de Laix 4d861ef022 push required flag into download data for later use. 2010-12-07 14:32:37 -08:00
brad kittenbrink f705453823 Fix for coding standard violations and build error on windows. 2010-12-03 17:12:35 -08:00
Andrew A. de Laix c767276ce6 expose update available method. 2010-12-02 11:37:26 -08:00