summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-02-23MergeXiaohong Bao
2011-02-23MergeXiaohong Bao
2011-02-23Automated merge with ssh://hg.lindenlab.com/bao/private-memory-poolXiaohong Bao
2011-02-23Merge from viewer-developmentXiaohong Bao
2011-02-22Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-22set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking.Xiaohong Bao
2011-02-17merge changes for storm-937Oz Linden
2011-02-15Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-15partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused ↵Xiaohong Bao
leaking.
2011-02-14debug_console is now resizableAndrew Meadows
Reviewed with Callum Linden.
2011-02-11STORM-975 : pull into viewer-developmentMerov Linden
2011-02-11STORM-833 : pull into viewer-developmentMerov Linden
2011-02-10STORM-986 : Fix for Linux buildMerov Linden
2011-02-10STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows ↵callum
systems
2011-02-09STORM-986 : pull into viewer-developmentMerov Linden
2011-02-09STORM-937 : Fix python scripts shebang line and license header for consistencyMerov Linden
2011-02-09pull from viewer-developmentMerov Linden
2011-02-10STORM-833 FIXED "i" button overlapping text in name list controls like Group ↵Seth ProductEngine
Members list.
2011-02-09Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-09trivial: remove some redundant code.Xiaohong Bao
2011-02-09debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in ↵Xiaohong Bao
LLSurface::getWaterHeight
2011-02-08STORM-601 : pull into viewer-developmentMerov Linden
2011-02-08STORM-433 : pull into viewer-developmentMerov Linden
2011-02-08STORM-507 : pull into viewer-developmentMerov Linden
2011-02-08STORM-953 : pull into viewer-developmentMerov Linden
2011-02-08STORM-955 : pull into viewer-developmentMerov Linden
2011-02-08STORM-960 : pull into viewer-developmentMerov Linden
2011-02-08VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the ↵callum
current working Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-06STORM-975 Duplicated menu entry Develop/Ui/Region Debug ConsoleJonathan Yap
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-02-04STORM-610 : Backing out that change (test fail)Merov Linden
2011-02-04Clean up license headers in a handfull of filesMerov Linden
2011-02-04STORM-655 : Pull into viewer-developmentMerov Linden
2011-02-04STORM-610 : Pull into viewer-developmentMerov Linden
2011-02-04STORM-601 FIXED Color swatch now receives focus on mouse click.Seth ProductEngine
2011-02-04STORM-433 FIXED Fixed reshaping notification panel with friendship offer ↵Seth ProductEngine
when it is inserted into IM chat.
2011-02-04STORM-465 FIXED Made all keys localizable.Vadim ProductEngine
Renamed HUD direction strings ("Left", "Right", "Up", "Down") to avoid strings duplication.
2011-02-03STORM-513 : pull into viewer-developmentMerov Linden
2011-02-03STORM-397 : pull into viewer-developmentMerov Linden
2011-02-03STORM-316 : pull into viewer-developmentMerov Linden
2011-02-02STORM-953 Clarify what happens when you uncheck Allow Public AccessJonathan Yap
Note: This change also incorporates STORM-960
2011-02-02STORM-960 Descriptive text missing next to first checkbox in About Land/AccessJonathan Yap
Contribution team: Aleric Inglewood, Alexandrea Fride, Robin Cornelius, and Siana Gearz
2011-02-02Merge with viewer-developmentMerov Linden
2011-02-02STORM-435 : pull into viewer-developmentMerov Linden
2011-02-02Pull from viewer-betaMerov Linden
2011-02-02STORM-957 : pull in viewer-beta (da and fr localization)Merov Linden
2011-02-02Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-02fix for Sh-445: debug settings -> "CacheNumberOfRegionsForObjects" does not ↵Xiaohong Bao
limit the number of object cache files
2011-02-01Sync with viewer-developmentMerov Linden
2011-02-01Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao