summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2013-04-26MergeGraham Madarasz
2013-04-26Fix ifdefs around asserts broken in release only by mergeGraham Madarasz
2013-04-26Appease TC cmake OCD about substring argsGraham Madarasz
2013-04-26Provide LLGLSLShader backwards compat so as not to break the appearance utilityGraham Madarasz
2013-04-26Fix linux breakage from sunshine mergeGraham Madarasz
2013-04-26Restore hysteresis in llviewertexture.cpp and side-step unused var (now used ...Graham Madarasz
2013-04-26Fix llmediadataclient test to include new dep on llprimitive and fix bogus bo...Graham Madarasz
2013-04-26Merge viewer-dev-mat and fix llvovolume.cpp missed sunshine mergesGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25merge changes for latest rendering fixesOz Linden
2013-04-25NORSPEC-67: fix update problem by not updating texture pickers when they are ...Oz Linden
2013-04-25add isPickerShown methodOz Linden
2013-04-25add some debug logging, make a single return in "get" methodOz Linden
2013-04-25NORSPEC-118 Compatibility pass against advanced lighting disabled.Dave Parks
2013-04-25Diagnostic message for debugging adv lighting enable fail on MB Air 2k11Graham Madarasz
2013-04-24NORSPEC-146 Fix for objects with alpha mode set to none or mask being shinyDave Parks
2013-04-24merge changes for DRTVWR-309Oz Linden
2013-04-24FIX INTL-114 translation for 9 languages of major update from CHUI (based on ...eli
2013-04-24sync with viewer-development (per DRTVWR-309)eli
2013-04-24Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-04-24Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-04-24Correct fix to include affect on ambient term and make work on Mac nVGraham Madarasz
2013-04-24Fix mismerge that lost Geenz colorspace conversion of diffuse in alphaVGraham Madarasz
2013-04-24Merge vwr-dev-matGraham Madarasz
2013-04-24NORSPEC-59 NORSPEC-125 make materials and alpha shaders work on Mac laptops w...Graham Madarasz
2013-04-24Fix for overbrigtened alpha blended objects in deferred. Linearize diffuse s...Geenz
2013-04-23Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-04-23Restore deferred avi alpha program vert color usageGraham Madarasz
2013-04-23Tweak to remove usage of GL_DEPTH_CLAMP for now until projectors can be made ...Dave Parks
2013-04-23NORSPEC-132 Correct rotation limits to +/- 180 for all texturesOz Linden
2013-04-23merge changes for 3.5.1-beta3Oz Linden
2013-04-23NORSPEC-142 Fix for unusable performance on GTX 285Dave Parks
2013-04-22SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special cha...Nyx Linden
2013-04-22Fix avatar alpha shader define setupGraham Madarasz (Graham)
2013-04-22NORSPEC-141 Back out a change that seems to cause shadow artifacts on rigged ...Dave Parks
2013-04-22Fix regression in alpha shader on non-Mac from recent changesGraham Madarasz (Graham)
2013-04-22merge changes for OPEN-173Oz Linden
2013-04-20Another mismergeGraham Madarasz (Graham Linden)
2013-04-20Fixup merge with vwr-dev-matGraham Madarasz
2013-04-20Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-04-20Fix rendering artifacts on Mac Mobile GeForce cardsGraham Madarasz
2013-04-19Fixed line endings on shaderGraham Madarasz
2013-04-19Fix forward decl to match changed func def and clear defines between shader c...Graham Madarasz
2013-04-19OPEN-173 FIX FMODEx Music stutters once every few seconds (OSS patch via Lati...callum
2013-04-19NORSPEC-139 Fix for non-fullscreen spotlight lighting mismatching fullscreen ...Dave Parks
2013-04-19Avoid mac shader compiler crash on someFuncTakingFloats(INTEGER_CONSTANT) mal...Graham Madarasz
2013-04-19MergeGraham Madarasz
2013-04-19Change permutation setup to match use of ifdefs (as opposed to ifs)Graham Madarasz
2013-04-19Change #ifs to #ifdefs for mac compilerGraham Madarasz (Graham Linden)
2013-04-19Rework ifdefing and fix windows shader compiler warnings from materialFGraham Madarasz