summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Expand)Author
2014-06-23merge changes for 3.7.10-releaseOz Linden
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-07Merge upstreamCinder
2014-06-05MergeRicky Curtice
2014-05-19Pull merge from lindenlab/viewer-releaseMerov Linden
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-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile er...Merov 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
2014-04-08mergeBrad Payne (Vir Linden)
2014-04-08merge changes for 3.7.5-releaseOz Linden
2014-04-07merge with releaseRichard Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov 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-25ACME-1327 : WIP : Added big preview to the Flickr photo panel, uses the thumb...Merov 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 pull from lindenlab/viewer-releaseMerov Linden
2014-02-10Merge downstream code with viewer-releasesimon
2014-01-09ACME-1244 : WIP : Move files around and introduced an llimagefiltersmanager t...Merov Linden
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 snapshot...maksymsproductengine
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
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
2013-11-06merge with releaseRichard Linden
2013-11-04added Twitter floater for ACME-1146, ACME-1147, ACME-1148, ACME-1149, and ACM...Cho
2013-11-02added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140, and ACME...Cho
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
2013-10-21STORM-1831 First attempt at using SyntaxIdLSL capability. (incomplete)Ima Mechanique
2013-10-16mergeBrad Payne (Vir Linden)