summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2013-05-21CHOP-947: create summary.json (really python) metadata file for TeamCity resultsOz Linden
2013-05-07merge changes for DRTVWR-299Oz Linden
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-17Merge with viewer-developmentcallum_linden
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-11Viewer-chui mergeprep
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-13Merge from viewer-betaprep
2013-02-05Merged with head of viewer-developmentcallum_linden
2013-02-04fmodwrapper uneeded with fmodexSovereign Engineer
2013-02-01Removed (most) references to older FMOD library - still a little Linux clean ↵callum_linden
up left
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-25CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. ↵Gilbert Gonzales
Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
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-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2013-01-18first push - patch from CmdCupCake plus force FMODEX oncallum_linden
2013-01-11Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2013-01-10Merge pull from lindenlab/viewer-betaMerov Linden
2013-01-09MAINT-1481: remove linux-updater; move logic to Linux update_installNat Goodspeed
Now that the viewer's own background updater logic is responsible for downloading a new installer, the only functionality we still use in linux-updater that couldn't be expressed more simply in bash is the UI. But since most Linux distros capable of running SL at all have zenity, and all will have xmessage, we can handle even the UI part. Add xmenity wrapper script so update_install doesn't have to care which is present, and make the bash script that used to launch linux-updater do the real work.
2012-12-18CHUI-499: Adding ability to serialize the communication notifications to ↵William Todd Stinson
local disk per user.
2012-12-12CHUI-499: Refactoring the persistent notification storage so that I can ↵William Todd Stinson
reuse the functionality for do-not-disturb mode.
2012-12-05Linux Viewer build fixes.Logan Dethrow
* Removed no longer used unpack_bufsize from bitpack_test.cpp * Added llviewertexture_stub.cpp to the newview tests directory to fix llworldmap_test.cpp and llworldmipmap_test.cpp linker errors.
2012-12-04Fix merge breakagesimon@Simon-PC.lindenlab.com
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-27merge changes for DRTVWR-230Oz Linden
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 https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-19Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-11-19MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max ↵Dave Parks
performance Reviewed by Simon.
2012-11-16Certain test and example programs now need the Boost.System library.Nat Goodspeed
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-09CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and ↵AlexanderP ProductEngine
in accordance with the naming convention in the project, some classes and corresponding files should be renamed: LLIMConversation -> LLFloaterIMSessionTab LLIMFloater -> LLFloaterIMSession LLNearbyChat -> LLFloaterIMNearbyChat LLIMFloaterContainer -> LLFloaterIMContainer LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
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-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-05CHUI-468 : Suppress LLCallFloater completelyMerov Linden
2013-03-08merge changes for 3.5.0-beta2Oz Linden
2013-03-06merge changes for DRTVWR-278Oz Linden
2013-03-05correct Mac bundle identifierOz Linden
2013-03-04force update of version number so that all packaging gets the correct numberOz Linden
2013-02-21add use of v1.1 update request protocol, with fallback to v1.0Oz Linden