summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-10-04Merge with 3.6.7dolphin
2013-09-26SH-3455 WIP - removed llagentwearablesfetch files, among other changesBrad Payne (Vir Linden)
2013-09-10mergeBrad Payne (Vir Linden)
2013-09-09merge with viewer-releaseRichard Linden
2013-09-09Pull from lindenlab/viewer-releaseMerov Linden
2013-09-09Merge viewer-releasesimon
2013-09-09Merge with 3.6.5dolphin
2013-09-04mergeBrad Payne (Vir Linden)
2013-08-28merging viewer releaseGilbert Gonzales
2013-08-27Mergedolphin
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-21Added new fields to the experience cache.dolphin
Experience profile moved to it's own floater, will probalby be moving again. XP profile displays most data, though the presentation is not final Fixed a bug with the XP selection combobox in the script editor
2013-08-19MergeXiaohong Bao
2013-08-16merge with viewer-releaseNyx Linden
2013-08-15Move the experience panel to the bottom of the editor floaterdolphin
2013-08-12SH-4399 FIX: Interesting: Texture console MB Bound 0/384 and texture queue ↵Richard Linden
bounces once per second SH-4346 FIX: Interesting: some integer Statistics are displayed as floating point after crossing region boundary made llerrs/infos/etc properly variadic wrt tags LL_INFOS("A", "B", "C") works, for example fixed unit tests remove llsimplestat
2013-08-08Merge with 3.6.2-releasedolphin
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-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-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-19Merge with viewer 3.6.0dolphin
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-29Merge with 3.5.4 releasedolphin
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-21mergeBrad Payne (Vir Linden)