summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-01-18MergeTank_Master
2014-01-18Fixed: BUG-4413LanceCorrimal
2014-01-17ACME-1236 : Refactor vignette into stencil, implement uniform and gradient ↵Merov Linden
stencils, implement dodge and add blend modes
2014-01-17MAINT-3536 FIXED new crash in XML_ParserFree: temporary solutionmaksymsproductengine
2014-01-16ACME-1236 : Small LLImageFilter clean upMerov Linden
2014-01-16ACME-1237 : Use translation service for filter names so they can be ↵Merov Linden
localized and as also look proper in English. General filter manager cleanup
2014-01-16Pulled merge from viewer-release.Aura Linden
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-15Replacing old keyword default file. This is NOT an LL sanctioned file, but a ↵Ima Mechanique
temporary personally generated one for testing while the canonical file is being prepared.
2014-01-15Adding error output for attributes containing MAP or ARRAY elements.Ima Mechanique
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-14Adding TODO for LLSD validating and version check, while I wait for some ↵Ima Mechanique
info on how to do it.
2014-01-14Fixing LL_INFOS out put for group colour that previous commit broke.Ima Mechanique
2014-01-14STORM-2007 Buy floater displays truncated names/permissions when object is ↵Jonathan Yap
set to sell original and sell copy.
2014-01-14storm-1831 Enabling highlighting of deprecated and god-mode functions.Ima Mechanique
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-14Removing the value "void" from return types and empty argument lists.Ima Mechanique
2014-01-14STORM-1831 Updated XML defaults file. Adding some recently added constants. ↵Ima Mechanique
Changed indenting to a single space. Adding the Relax schema file that is referenced in the XML.
2014-01-13ACME-1256 : Rename and cleanup in the default filtersMerov Linden
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