summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2013-04-02merge changes for 3.5.0-beta7Oz Linden
2013-04-01merge changes for 3.5.0-beta7Oz Linden
2013-03-30Fix for linux build?Dave Parks
2013-03-29Google Breakpad Fix. Code reviewed by DavePGraham Madarasz (Graham Linden)
2013-03-27Fix breakpad breakage from linux API diffsGraham Madarasz
2013-03-27Revert previous change because breakpad's ExceptionHandler class has ↵Graham Madarasz (Graham Linden)
different API on diff platforms
2013-03-27Fix use of breakpad ExceptionHandler on windowsGraham Madarasz (Graham Linden)
2013-03-27Fix API diffs with new breakpad and point at private breakpad packages to testGraham Madarasz
2013-03-01merge fix for unit test problem with some python configurationsOz Linden
2013-03-01remove use of system llbase module in integration tests; always use the one ↵Oz Linden
from this tree
2013-02-25increment version to 3.5.1Oz Linden
2013-02-25increment minor version: 3.5.0Oz Linden
2013-02-18Automated merge with https://bitbucket.org/lindenlab/viewer-chuiRichard Linden
2013-02-18CHUI-739 FIX FUI toolbars not displayed when switching between CHUI and ↵Richard Linden
release viewer param blocks no longer write enums as ints
2013-02-14CHUI-739 : Clean up : FUI toolbars not displayed when switching between CHUI ↵AlexanderP ProductEngine
and release viewer
2013-02-13CHUI-739 Fixed! FUI toolbars not displayed when switching between CHUI and ↵AlexanderP ProductEngine
release viewer : parsing declare values of Enums
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-01-31merge workaround for llprocess test failuresOz Linden
2013-01-31workaround by skipping llprocess tests that frequently fail on WindowsOz Linden
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-10increment viewer version to 3.4.6Oz Linden
2013-01-10Merge pull from lindenlab/viewer-betaMerov 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-13CHUI-599 : Fixed : Avatar name provides now a method to get the regular ↵Merov Linden
account name.
2012-12-07CHUI-580 : Fixed : Clean up the use of display name. Allow the use of the ↵Merov Linden
legacy protocol in settings.xml
2012-12-05CHUI-580 : WIP : Change the display name cache system, deprecating the old ↵Merov Linden
protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-26merge changes for DRTVWR-249Oz Linden
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
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-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
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-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-19merge back late fix for MAINT-1753Oz Linden