summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2014-01-07merge changes for 3.6.12-releaseOz Linden
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-12Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-10mergeBrad Payne (Vir Linden)
2013-12-09Pulled viewer-releaseAura Linden
2013-12-09merge with releaseRichard Linden
2013-12-05Renamed floater_social to floater_facebook for ACME-1205Cho
2013-12-03Creating a cleaner branchAura Linden
2014-05-08viewer-release merge (to 3.7.8)Baker Linden
2014-04-08merge viewer-releaseBaker Linden
2014-02-11viewer-release mergeBaker Linden
2013-12-18viewer-release mergeBaker Linden
2013-11-24normalize format of and add arch to all installer namesOz Linden
2013-11-18merge changes for STORM-1831Oz Linden
2013-11-15STORM-1980 Added a floater displaying a countdown timer.Jonathan Yap
Removed most of the previous changes.
2013-11-06merge with releaseRichard Linden
2013-11-04added Twitter floater for ACME-1146, ACME-1147, ACME-1148, ACME-1149, and ↵Cho
ACME-1150
2013-11-02added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140, and ↵Cho
ACME-1141
2013-11-01added LLTwitterConnect for ACME-1133Cho
2013-11-01added LLFlickrConnect for ACME-1116Cho
2013-10-29Merge viewer-release => sunshine-internalDon Kjer
2013-10-24SH-4577 WIP Interesting: viewer crashed when clicking a offline Conversation ↵Richard Linden
containing a shared object potential fix by making instance tracker allow key collisions for LLToastNotifyPanel changed assertion macro to use original unpreprocessed source code renamed instance tracker behavior macros to use LL prefix added RestoreCameraPosOnLogin setting to optionally restore old camera positioning behavior
2013-10-21STORM-1831 First attempt at using SyntaxIdLSL capability. (incomplete)Ima Mechanique
2013-10-16mergeBrad Payne (Vir Linden)
2013-10-15Renaming file to better reflect it's actual usage for the future.Ima Mechanique
2013-10-08merge from viewer-releaseRichard Linden
2013-10-04Merge v3.6.7 inIma Mechanique
2013-10-04Pull merge of lindenlab/viewer-releaseMerov Linden
2013-09-30Merge with voorhees (viewer-release)Baker Linden
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-04mergeBrad Payne (Vir Linden)
2013-08-29Initial commit for GroupBanBaker Linden
- Lots of crap isn't working as intended yet.
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-19MergeXiaohong Bao
2013-08-16merge with viewer-releaseNyx Linden
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-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