summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-05-02ACME-306 : Pull merge from viewer-chuiMerov Linden
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham Madarasz
2013-04-26Fix llmediadataclient test to include new dep on llprimitive and fix bogus ↵Graham Madarasz
boost lib refs in llprimitive cmake def
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-23ACME-251 Create AvatarFolderItemView: Re-adding llpersonfolderview.h/cpp and ↵Gilbert Gonzales
to use a class called LLPersonFolderView to manage the creation of subwidgits and selection of tabs.
2013-04-23ACME-251 Create AvatarFolderItemView: forgot to remove deleted files from ↵Gilbert Gonzales
indra/newview/CMakeLists.txt.
2013-04-23ACME-251 Create AvatarFolderItemView: When making the folderview using ↵Gilbert Gonzales
LLPersonModelCommon instead of LLConverationItem. Also the .xml file file read in for LLPersonTabView was incorrect, now using person_tab_view.xml. And lastly made a new file called llpersonfolderview which which be the implementation of folderview.
2013-04-23ACME-251 Create AvatarFolderItemView: Changed classes name from ↵Gilbert Gonzales
LLPersonFolder* to LLPersonTab*
2013-04-22ACME 162: Implemented a foundation model for the facebook connect folder view.Gilbert Gonzales
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-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-04merging in viewer-chuiGilbert Gonzales
2013-04-02created LLSocialList and LLSocialListItem and linked them up to the facebook ↵Gilbert Gonzales
tab.
2013-04-01merge changes for 3.5.0-beta7Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. ↵simon
Reviewed by Kelly
2013-03-27New gmock with WChar fix and add boost sys lib to viewer source testsGraham Madarasz
2013-03-27Rollback the boost sys lib inclusion in integ tests as it was causing dup ↵Graham Madarasz
symbols
2013-03-26Add Boost System library to all testsOz Linden
I don't know what added this requirement, but this last night lots of them started failing to link. Also remove some obsolete commented-out stuff
2013-03-25Pull and merge downstream code with CHUI viewer-development by way of ↵simon
viewer-lion
2013-03-25merge changes for storm-1911Oz Linden
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-11Viewer-chui mergeprep
2013-02-22Merge new boost and add OS X 10.8 modsGraham Madarasz (Graham 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-15Added ca-bundle.crt behaviors for Mac and Windows.Aura Linden
2013-02-13Merge from viewer-betaprep
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-02-05Merged with head of viewer-developmentcallum_linden
2013-02-04Added a new draw pool specifically for faces with materials applied to them. ↵Geenz
Removed materials rendering from the bump draw pool, and reverted it to its previous state.
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-30merge downstream code from viewer-lionsimon@Simon-PC.lindenlab.com
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-24Merged with latest viewer-dev.Geenz
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-23MergeGeenz
2013-01-23Recovered changes for dirpicker and filepickerAura Linden
2013-01-18first push - patch from CmdCupCake plus force FMODEX oncallum_linden
2013-01-16remove prototype access code used for server testingOz Linden
2013-01-11Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 22:18:28 +0000