summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
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-11Updating linux build to gcc4.6Don Kjer
2012-10-04merge changes for DRTVWR-222Oz Linden
2012-10-03Backed out changeset: eb957fafe167William Todd Stinson
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-21More windows build fixesdeveloper@Developer-PC
2012-09-21Adding the CXX to each CMake project definition.William Todd Stinson
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20Restoring llrenderheadless changes so we can fix themDon Kjer
2012-09-20Fix for windows compile issueDon Kjer
2012-09-20Skipping experimental filebuffering code on windows for nowDon Kjer
2012-09-20Partial rewrite of llifstream and llofstream (Windows implementation ↵Don Kjer
pending). Moved more functionality from llviewerwearable to llwearable
2012-09-18CHUI-283: Now the avatar icon loads in the user's avatar image.Also the ↵Gilbert Gonzales
avatar image is of proper size. The participant of the conversation is offset correctly as well.
2012-09-17Merge minor changes from viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-14Removed appearance utility from viewer source. Added appearance utility ↵Don Kjer
autobuild package.
2012-09-13CHUI-283: Now upon the information icon and speaker icon do not overlap the ↵Gilbert Gonzales
username text. Instead the username text will be truncated with an ellipse to prevent the overlap. Also did a code cleanup.
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-10CHUI-283: Basic Implementation, just have hard coded avatar icon appearing ↵Gilbert Gonzales
and profile/info buttons visible. profile/info buttons do not have proper positioning or mouseclick events.
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.
2012-09-07Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-31MAINT-1503 Fix for ll_aligned_realloc returning non-aligned pointers on linuxDave Parks
2012-08-31MAINT-1503 Fix for ll_aligned_realloc returning non-aligned pointers on linuxDave Parks
2012-08-31Fix longstanding LLURI::buildHTTP() bug when passing string path.Nat Goodspeed
The LLURI::buildHTTP() overloads that take an LLSD 'path' accept 'undefined', LLSD::String and (LLSD::Array of LLSD::String). A sequence of path components passed in an Array is constructed into a slash-separated path. There are unit tests in lluri_test.cpp to exercise that case. To my amazement, there were NO unit tests covering the case of an LLSD::String path. The code for that case escaped and appended the entire passed string. While that might be fine for a 'path' consisting of a single undecorated path component, the available documentation does not forbid one from passing a path containing slashes as well. But this had the dubious effect of replacing every slash with %2F. In particular, decomposing a URL string with one LLURI instance and constructing another like it using LLURI::buildHTTP() was not symmetrical. Having consulted with Richard, I made the string-path logic a bit more nuanced: - The passed path string is split on slashes. Every path component is individually escaped, then recombined with slashes into the final path. - Duplicate slashes are eliminated. - The presence or absence of a trailing slash in the original path string is carefully respected. Now that we've nailed down how it ought to behave -- added unit tests to ensure that it DOES behave that way!!
2012-08-30MAINT-1486 FIX Crash on login (Unhandled exception)Richard Linden
open root timer by default
2012-08-30MergeRichard Linden
2012-08-30MAINT-1486 FIX Crash on login (Unhandled exception)Richard Linden
cleaner implementation of llfasttimers...don't bother to share similarly named timers just create multiple timers with same name...doesn't break anything
2012-08-30Automated merge with https://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-08-30MAINT-1486 FIX Crash on login (Unhandled exception)Richard Linden
allow duplicate named fast timers again, refactored timer code
2012-08-31MAINT-1486 FIXED Crash on login (Unhandled exception)MaksymS ProductEngine
2012-08-27Skipping the realloc alignment test on Linux as the ll_aligned_malloc_16() ↵William Todd Stinson
function is not implemented to ensure alignment on Linux.
2012-08-25MergeRichard Linden