summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using ↵Graham Madarasz
material instead of mMaterial
2013-05-10Merge with vwr-dev-matGraham Madarasz
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-09MAINT-2665 FIX Crashes not being reported in some casesRichard Linden
made marker file lock use append, not truncate
2013-05-09remove duplications and other errors introduced during the mergeOz Linden
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-23merge changes for latest viewer-developmentOz Linden
2013-04-23merge changes for 3.5.1-beta3Oz Linden
2013-04-22SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special ↵Nyx Linden
characters. Integrated Nicky Dasmijn's patch to handle the unicode file paths properly. Code reviewed, patch was clean. Tested locally, correctly allows wearables to load where they would fail before. Should be ready for automated build & QA.
2013-04-19merge up to latest viewer-development for merge to 3.5.2Oz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-04-12increment version to 3.5.2Oz Linden
2013-04-09fix? race condition that occasionally fails in unit testOz Linden
2013-04-04merge with latest viewer-developmentNyx Linden
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-29Viewer breakpad linux fixesGraham Madarasz
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28Google Breakpad FixGraham 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-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-03-05Fixing issues with not detecting when LLSD XML parsing fails. Changing most ↵Don Kjer
http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
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-21MAINT-2389: Change viewer to Boost package without ucontext.h.Nat Goodspeed
In autobuild.xml, specify today's build of the Boost package that includes the Boost.Context library, and whose boost::dcoroutines library uses Boost.Context exclusively instead of its previous context-switching underpinnings (source of the ucontext.h dependency). Add BOOST_CONTEXT_LIBRARY to Boost.cmake and Copy3rdPartyLibs.cmake. Link it with the viewer and with the lllogin.cpp test executable. Track new Boost package convention that our (early, unofficial) Boost.Coroutine library is now accessed as boost/dcoroutine/etc.h and boost::dcoroutines::etc. Remove #include <boost/coroutine/coroutine.hpp> from llviewerprecompiledheaders.h and lllogin.cpp: old rule that Boost.Coroutine header must be #included before anything else that might use ucontext.h is gone now that we no longer depend on ucontext.h. In fact remove -D_XOPEN_SOURCE in 00-Common.cmake because that was inserted specifically to work around a known problem with the ucontext.h facilities.
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-25BUILDFIX: merge cleanupNyx Linden
A couple of merge issues that caused the resulting code to not build.
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-10increment viewer version to 3.4.6Oz Linden