summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-01-13Pull merge from lindenlab/viewer-releasemerov
2014-01-11Updated indenting of XML file to use a single tab per indent level. This ↵Ima Mechanique
also reduces the file size by over 200KB
2014-01-11Correcting int to U32Ima Mechanique
2014-01-11ACME-1243 : WIP : Populate filter drop down with filter list dynamicallymerov
2014-01-10added some defensive asserts in lltrace to make cases of misuse more obvious ↵Richard Linden
when it crashes
2014-01-10Merge after backoutsimon
2014-01-10Revert earlier back-out for MAINT-535 ... it's back insimon
2014-01-09ACME-1236 : Add lines as a new type of vignette and Brightscan as an exampleMerov Linden
2014-01-09Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2014-01-09fix for SH-4659:crash at LLOcclusionCullingGroup::doOcclusion line 1150Xiaohong Bao
2014-01-10Pull merge from viewer-acme-devmerov
2014-01-09ACME-1244 : WIP : Move files around and introduced an llimagefiltersmanager ↵Merov Linden
to get the filters
2014-01-09mergeBrad Payne (Vir Linden)
2014-01-09Merge. Refresh from viewer-release after 3.6.13 release.Monty Brandenberg
2014-01-09merge with releaseRichard Linden
2014-01-09MergeRichard Linden
2014-01-09SH-4667 HTTP Viewer reports network error instead of a misnamed joint on ↵Monty Brandenberg
mesh upload Tried to add consistent mesh upload retries in the HTTP work but a combination of bad status choices in the upload service and the one-shot nature of the upload capabilities means that status information can be lost. For now, retain the wonderful manual retry logic. At some future point, we might fix the services or add application-level retry.
2014-01-09fixed unit tests being generated as Windows GUI projects instead of console ↵Richard Linden
projects
2014-01-09Merge 3.6.14 from releasesimon
2014-01-08Fix ambiguous pow call (use powf) insteadMerov Linden
2014-01-08merge changes for 3.6.13-releaseOz Linden
2014-01-08increment viewer version to 3.6.14Oz Linden
2014-01-08Added tag 3.6.13-release for changeset 0d9b9e50f1a8Oz Linden
2014-01-08Pull merge from lindenlab/viewer-acmeMerov Linden
2014-01-08ACME-1236 : WIP : Added Newspaper filter to the bank of filtersMerov Linden
2014-01-08ACME-1236 : WIP : Added mode and angle parameter to filterScreen (renamed ↵Merov Linden
for consistency)
2014-01-08Removed support for secondlife:///app/slshare for ACME-1263Cho
2014-01-08trivial: convert to unix line endings.Xiaohong Bao
2014-01-08MAINT-3591 FIXED Remove "Start Second LIfe now?" dialogue in the installermaksymsproductengine
2014-01-14MAINT-3412 add gpu_table line with distinct Intel Iris Pro OpenGL regex to ↵Graham Linden
match new MBP with forced Intel graphics
2014-01-14mergeMaximB ProductEngine
2014-01-14MAINT-3262 FIXED Allow uploading gif-imagesMnikolenko ProductEngine
2014-01-14MAINT-3510 (Incorrect context menu entry in Places floater)MaximB ProductEngine
2014-01-13MAINT-3621 FIXED Set name to "Unnamed" if object's name consists of whitespaces.Mnikolenko ProductEngine
2014-01-10MAINT-3364 FIXED Call clearSelection() from root_folderMnikolenko ProductEngine
2014-01-09Merge downstream -bearsimon
2014-01-09Merge 3.6.14simon
2014-01-08STORM-68 Remove obsolete note. Refactor a few blocks of code to not have ↵Jonathan Yap
early returns
2014-01-08MAINT-3520 FIXED Сall arrange(NULL, NULL) to avoid occasional drag'n'drop ↵Mnikolenko ProductEngine
folders after renaming.
2014-01-07ACME-1236 : WIP : Introduced screenFilter, simple creative screening filterMerov Linden
2014-01-08Fix linux buildSimon Linden
2014-01-07Pull merge from lindenlab/viewer-acmeMerov Linden
2014-01-07ACME-1236 : WIP : Add filter files to app_settings/filters (not loaded yet)Merov Linden
2014-01-07ACME-1236 : WIP : Add filter file loading and execution to llimage_libtest, ↵Merov Linden
suppress the a la Instagram tests as a result
2014-01-07Revert changes made for MAINT-535 to test in a release cohort.simon
2014-01-07merge changes for Snowstorm fall contributionsOz Linden
2014-01-07merge changes for storm-1980Oz Linden
2014-01-07merge changes for 3.6.12-releaseOz Linden
2014-01-06fix a compiling error for mac and linux.Xiaohong Bao
2014-01-06ACME-1236 : WIP : Make each color correct filter use a per channel alpha ↵Merov Linden
argument, tweak Instagram-like test filters for discussion