summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2013-01-10increment viewer version to 3.4.6Oz Linden
2013-01-08merge changes for DRTVWR-250Oz Linden
2012-12-19MAINT-1986: merge in server-trunk fixesNat Goodspeed
2012-12-18MAINT-1986: patch OPSDEV-111 fix (rev 9346b73d6843) from server-trunkNat Goodspeed
2012-12-18MAINT-1986: patch DEV-50942 fix (rev 28828ba0f0be) from server-trunk.Nat Goodspeed
2012-12-17increment version to 3.4.5Oz Linden
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-26merge changes for DRTVWR-249Oz Linden
2012-11-20Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-19increment version to 3.4.4Oz Linden
2012-11-16Some Mac header #defines macros like check and equivalent -- gack!!Nat Goodspeed
Given that third-party libraries (such as Boost) can and do use those names, properly namespace-scoped, it's unpardonable to break any such innocent usage with a macro. Given the pervasiveness of the need, introduce a header file with the requisite #undef directives.
2012-11-16Boost 1.52 no longer supports Boost.Filesystem v2 -- don't request.Nat Goodspeed
Instead of compatibility mode, #defining BOOST_FILESYSTEM_VERSION to 2 only gets you a compile error these days.
2012-11-13Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-13merge changes for DRTVWR-238Oz Linden
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-08merge up to viewer-developmentOz Linden
2012-11-07Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-07MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. ↵Dave Parks
Disable private memory pools. Make viewer large address aware on windows. Reviewed by Kelly
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x.
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-05increment version to 3.4.3Oz Linden
2012-10-19merge back late fix for MAINT-1753Oz Linden
2012-10-18MAINT-1753: Correcting behavior of ll_aligned_realloc_16() on Linux to avoid ↵William Todd Stinson
memory corruption in the case that the new memory size requested is smaller than the old memory size. Also, adding check to ensure that the aligned malloc returns a non-null value before memcopying.
2012-10-16Pull back viewer-development with latest beta mergessimon@Simon-PC.lindenlab.com
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-15pull back 3.4.1-beta7 fixesOz Linden
2012-10-11MAINT-1684: Correcting the calls to ll_aligned_free() which should have ↵William Todd Stinson
actually been to ll_aligned_free_16().
2012-10-11MAINT-1684: Attempt at correcting the linux crash on startup. Replacing the ↵William Todd Stinson
memory allocations and frees in the LLPrivateMemoryPool with aligned memory allocations and frees.
2012-10-10pull back 3.4.1-beta6 fixesOz Linden
2012-10-04merge changes for DRTVWR-222Oz Linden
2012-10-03Fix for mac/linux buildDave Parks
2012-10-03Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix ↵Dave Parks
out-of-order deletion of LLTextureFetch on shutdown
2012-10-02Instrument debug builds on windows to help track down source of heap corruptionDave Parks
2012-10-01Only enable breakpad error handing if crash reporting is enabledDave Parks
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-17Merge minor changes from viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-12Automated merge with https://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-09-12MAINT-1556 FIX LLSD param blocks should accept enum valuesRichard Linden
fix for gcc builds
2012-09-12re-merge changes to disable tcmallocOz Linden
2012-09-12merge increment of version numberOz Linden
2012-09-12increment version to 3.4.2Oz Linden
2012-09-12MAINT-1503 Minimal set of changes needed to safely disable tcmallocDave Parks
2012-09-12initial attempt to restore changes that make removing tcmalloc possible; not ↵Oz Linden
tested
2012-09-12Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-09-12Handle the NULL case on ll_aligned_realloc_16 on linuxDave Parks
2012-09-11MAINT-1556 FIX LLSD param blocks should accept enum valuesRichard Linden
always parse named values first added detection of enum-type values and now parse as ints
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-07MAINT-1503 Fix for linux buildDave Parks
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
This was yet another refresh from v-d because of significant changes to lltexturefetch that would not have been resolvable by casual application of any merge tool. There are still a few questions outstanding but this is the initial, optimistic merge.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 01:33:26 +0000