summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2014-04-07Merge in viewer-release and version update to 3.7.6simon
2014-02-24Pulled from release.obscurestar
2014-02-10Merge downstream code with viewer-releasesimon
2014-01-03merge changes for 3.6.12-releaseOz Linden
2013-12-21MAINT-3587 FIXED settings.xml still references avatarsunited.com for ↵maksymsproductengine
snapshot upload
2013-12-09Pulled viewer-releaseAura Linden
2013-12-03Creating a cleaner branchAura Linden
2013-11-24normalize format of and add arch to all installer namesOz Linden
2013-11-15STORM-1980 Added a floater displaying a countdown timer.Jonathan Yap
Removed most of the previous changes.
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-09-09Pull from lindenlab/viewer-releaseMerov Linden
2013-09-09Merge viewer-releasesimon
2013-08-28merging viewer releaseGilbert Gonzales
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-05Merge downstream code - Vivox releasesimon
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05correct coding standards problemsOz Linden
2013-08-05Pull merge from lindenlab/viewer-releaseMerov Linden
2013-08-05merge changes for 3.6.2-releaseOz Linden
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-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-19Pull merge from lindenlab/viewer-releaseMerov Linden
2013-06-19Merge with viewer-release.Geenz
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-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-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