summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-24merge up to latest snowstorm integration branchOz Linden
2013-07-11Merged in viewer-releaseAura Linden
2013-06-28mergeGilbert Gonzales
2013-06-28ACME-638: Removing the personfolderview, personmodelcommon and ↵Gilbert Gonzales
persontabview. Also removing FBC Test Two tab from the 'People' panel.
2013-06-28removed FB photo sharing from snapshot floater for ACME-639Cho
2013-06-28ACME-638: Removed LLSocialList class and FBC Test tab in the People panel.Gilbert Gonzales
2013-06-28Removing app_setting/keywords_lsl_colors.xml from CMake build file.Ima Mechanique
2013-06-26Merging last four months of developmentIma Mechanique
2013-06-24ACME-593 Populate the image with the actual screenshot image: Placed ↵Gilbert Gonzales
LLSnapshotLivePreview class into file llsnapshotlivepreview.h/cpp so that it could be utilized by other classes.
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20merge with releaseRichard Linden
2013-06-19Pull merge from lindenlab/viewer-releaseMerov Linden
2013-06-19Merge with viewer-release.Geenz
2013-06-18merge with viewer-releaseNyx Linden
2013-06-17CHUI 560: When Me->Post to Facebook... is selected the Facebook floater opens.Gilbert Gonzales
2013-06-17CHUI 560: Adding socialpanel.h/cpp filesGilbert Gonzales
2013-06-17Merged with viewer-releaseGeenz
2013-06-07SH-4216 WIP - moved AISv3 commands and responders to llaisapi.* filesBrad Payne (Vir Linden)
2013-06-05merge with viewer-releaseRichard Linden
2013-05-31ACME-453, ACME-455, ACME-456, ACME-465 : Duplicate and tweak the Snapshot ↵Merov Linden
Profile UI to create the Snapshot Facebook UI
2013-05-30Pull merge from viewer-releaseMerov Linden
2013-05-29Merge downstream codesimon
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-21mergeBrad Payne (Vir Linden)
2013-05-21CHOP-947: create summary.json (really python) metadata file for TeamCity resultsOz Linden
2013-05-15Thanks mercurial.Aura Linden
2013-05-14Fix incorrect generation of Info.plist. Use a custom Info.plist template here.Geenz
2013-05-13Merged with https://bitbucket.org/lindenlab/viewer-betaGeenz
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using ↵Graham Madarasz
material instead of mMaterial
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-05-08ACME-348 : WIP : LLFacebookConnect refactoringMerov Linden
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