Commit Graph

14779 Commits (17854c4e8702febaa8fe4adfbc678f9abaaa52c7)

Author SHA1 Message Date
Xiaohong Bao 17854c4e87 fix an issue on mac and linux, also fix an assertion. 2011-04-04 14:40:07 -06:00
Xiaohong Bao a40ee94cd6 fix the bug for mac and linux of continuously adjusting memory. 2011-04-04 10:00:29 -06:00
Xiaohong Bao fc106df530 fix the compiling error: "free" is defined and in use globally. 2011-02-24 19:47:55 -07:00
Xiaohong Bao ae65347e33 fix an exit crash. 2011-02-23 20:11:01 -07:00
Xiaohong Bao 844bf22d25 apply private pool to VBO 2011-02-23 19:48:08 -07:00
Xiaohong Bao 108980f68c add types to LLPrivateMemoryPool 2011-02-23 17:53:08 -07:00
Xiaohong Bao 95838efeaa Merge 2011-02-23 14:39:42 -07:00
Xiaohong Bao d593f5c1d3 fix a merge error 2011-02-23 14:35:53 -07:00
Xiaohong Bao 29415d1407 Merge 2011-02-23 13:48:35 -07:00
Xiaohong Bao 1f0cc07482 fix an assert error 2011-02-23 12:41:33 -07:00
Xiaohong Bao 609c70eb5a separate vertex buffer and index buffer when map/unmap VBO. can be treated as part of STORM-1011.
reviewed by davep.
2011-02-23 11:41:13 -07:00
Xiaohong Bao bfa25219b8 Automated merge with ssh://hg.lindenlab.com/bao/private-memory-pool 2011-02-23 11:10:13 -07:00
Xiaohong Bao 01cdeb0cdd Merge from viewer-development 2011-02-23 10:44:59 -07:00
Xiaohong Bao e216fabde0 Automated merge with http://hg.secondlife.com/viewer-development 2011-02-22 13:29:22 -07:00
Xiaohong Bao 2ebcf802cb set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking. 2011-02-22 13:28:48 -07:00
Xiaohong Bao 417069f152 more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. 2011-02-22 11:22:50 -07:00
Oz Linden 1a79aeca54 merge changes for storm-937 2011-02-17 15:09:50 -05:00
Oz Linden eacd9d5d59 merge changes for storm-981 2011-02-16 15:52:05 -05:00
Xiaohong Bao ff5e3f5c2e Automated merge with http://hg.secondlife.com/viewer-development 2011-02-15 15:43:47 -07:00
Xiaohong Bao f13884e528 partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. 2011-02-15 14:12:58 -07:00
Andrew Meadows c28fe65252 debug_console is now resizable
Reviewed with Callum Linden.
2011-02-14 14:15:12 -08:00
Oz Linden 3555849644 bump version number to 2.7.0 2011-02-14 16:58:46 -05:00
Oz Linden 068253b2fb Added tag 2.6.0-start for changeset 92e58e51776a 2011-02-14 16:57:10 -05:00
Merov Linden e15b543dd6 STORM-975 : pull into viewer-development 2011-02-11 17:42:37 -08:00
Merov Linden 58d8b666c2 STORM-833 : pull into viewer-development 2011-02-11 17:40:48 -08:00
Merov Linden 10cf492ef1 STORM-937 : Use subprocess instead os commands in python, suppress crufty svn code 2011-02-11 16:56:28 -08:00
Oz Linden 924be3f25c pull back release tag from viewer-beta 2011-02-11 11:38:27 -05:00
Dessie Linden 40abc0fe1e Added tag 2.5.0-release, DRTVWR-31_2.5.0-release for changeset b723921b5c71 2011-02-11 08:08:00 -08:00
Merov Linden 547b40bfc8 STORM-986 : Fix for Linux build 2011-02-10 11:56:06 -08:00
callum 6a5d194526 STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows systems 2011-02-10 11:51:53 -08:00
Merov Linden 9aaf4b3ba7 STORM-981 : Fix Linux link issues when LL_TESTS is ON 2011-02-09 22:08:43 -08:00
Merov Linden 76cb9a7796 STORM-986 : pull into viewer-development 2011-02-09 20:18:26 -08:00
Merov Linden 896bc12a2b STORM-937 : Fix python scripts shebang line and license header for consistency 2011-02-09 15:23:07 -08:00
Merov Linden b82f2c4e4d pull from viewer-development 2011-02-09 15:10:26 -08:00
Seth ProductEngine 65e88ce61d STORM-833 FIXED "i" button overlapping text in name list controls like Group Members list. 2011-02-10 00:34:54 +02:00
Xiaohong Bao b6571ee127 Automated merge with http://hg.secondlife.com/viewer-development 2011-02-09 12:16:00 -07:00
Xiaohong Bao 8d43cb2701 trivial: remove some redundant code. 2011-02-09 12:15:21 -07:00
callum 0ea1b472c6 Additional fix for llmediaplugintest compilation failure after fix for VWR-21275 2011-02-09 10:12:20 -08:00
Xiaohong Bao 54cced2356 debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in LLSurface::getWaterHeight 2011-02-09 10:33:07 -07:00
Merov Linden e58cbfa53e STORM-601 : pull into viewer-development 2011-02-08 22:26:03 -08:00
Merov Linden 300c79e7af STORM-433 : pull into viewer-development 2011-02-08 22:25:10 -08:00
Merov Linden 1c47a23d6b STORM-507 : pull into viewer-development 2011-02-08 22:24:26 -08:00
Merov Linden 47642e96f9 STORM-953 : pull into viewer-development 2011-02-08 22:23:32 -08:00
Merov Linden 6ba900073f STORM-955 : pull into viewer-development 2011-02-08 22:22:25 -08:00
Merov Linden 2a13dc7930 STORM-960 : pull into viewer-development 2011-02-08 22:21:15 -08: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
Jonathan Yap 979cd0300f STORM-975 forgot to update contributions.txt 2011-02-07 11:55:17 -05:00
Jonathan Yap 3b246d3182 STORM-975 Duplicated menu entry Develop/Ui/Region Debug Console 2011-02-06 18:26:47 -05: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
Merov Linden 09b009fc23 STORM-610 : Backing out that change (test fail) 2011-02-04 16:38:26 -08:00