summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-01-16ACME-1237 : Rename filters so that it doesn't trip Windows NSIS script ↵merov
installer (ridiculous...)
2014-01-16What passess in MSVC may not pass in Teamcity.Aura Linden
2014-01-16Fixed syntax issue that was wrapped in #if that didn't get hit until we got ↵Aura Linden
to teamcity. oops.
2014-01-15Fixes from Windows build including utf-16 to utf-8 conversions.Aura Linden
2014-01-15Pull merge from viewer-releaseMerov Linden
2014-01-15ACME-1236 : Clean up llimage after refactoring so there's no difference with ↵Merov Linden
viewer-release
2014-01-15MAINT-3397 : fix to use slurl for localization handler for ↵simon
EstateManagerFailedllTeleportHome message
2014-01-15ACME-1245 : Tweak a bit the Video.xml filterMerov Linden
2014-01-15ACME-1236 : Add comments to LLImageFilterMerov Linden
2014-01-14ACME-1236 : Refactor filters and vignette into llimagefilter, add example ↵Merov Linden
filters to llimage_libtest
2014-01-14Some cleanup of string to wstring conversion and vice versa.Aura Linden
2014-01-13ACME-1244 : WIP : Execute filters in Flickr panel. Testable but code beeds ↵Merov Linden
clean up.
2014-01-13ACME-1244 : Introduced llimage/llimagefilter, refactored the filter ↵Merov Linden
execution code, simplified llimage_libtest filter testing
2014-01-13ACME-1256 : Rename and cleanup in the default filtersMerov Linden
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-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-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-07ACME-1236 : WIP : Introduced screenFilter, simple creative screening filterMerov 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-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
2014-01-06fix for SH-4656: crash at LLVOCacheEntry::updateParentBoundingInfo() line 510Xiaohong Bao
2014-01-04STORM-1980 Center floater on screen. Tweak shaking parameters.Jonathan Yap
2014-01-03ACME-1236 : WIP : Add 2 new color correction filters. Add a la Instagram ↵Merov Linden
composite filters for testing in llimage_libtest
2014-01-03ACME-1236 : WIP : Added a min value to vignetteMerov Linden