summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-07Merge upstreamCinder
2014-06-05MergeRicky Curtice
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-14Begin syntax coloring personalizationCinder
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-04-23merge changes for STORM-1831Oz Linden
2014-04-22merge changes for OPEN-199Oz Linden
2014-04-18Begin moving script editor portions of LLTextEditor to their own derived class.Cinder
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
2014-04-08mergeBrad Payne (Vir Linden)
2014-04-08merge changes for 3.7.5-releaseOz Linden
2014-04-07merge with releaseRichard Linden
2014-04-07Merge in viewer-release and version update to 3.7.6simon
2014-03-19OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBSOz Linden
2014-02-25merge changes for 3.7.2-releaseOz Linden
2014-02-24Pulled from release.obscurestar
2014-02-12merge with releaseRichard Linden
2014-02-11mergeBrad Payne (Vir Linden)
2014-02-10Merge downstream code with viewer-releasesimon
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-10mergeBrad Payne (Vir Linden)
2013-12-09Pulled viewer-releaseAura Linden
2013-12-09merge with releaseRichard Linden
2013-12-03Creating a cleaner branchAura 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-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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 07:29:30 +0000