summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-05-03Merge with vwr-dev-matGraham Madarasz (Graham)
2013-05-02Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-02NORSPEC-157 make texture repeats/offsets controls display in media modeGraham Madarasz
2013-05-02NORSPEC-157 make texture repeats/offsets controls display in media modeGraham Madarasz
2013-05-02NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into ↵Dave Parks
alpha mask pool.
2013-05-02NORSPEC-99 add break statement to fix legacy bump vert program from being ↵Graham Madarasz
stomped with inappropriate material prog sans skinning
2013-05-02Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-05-01NORSPEC-119 redux : fix getState to find the material ID of individually ↵Graham Madarasz
selected faces correctly
2013-05-02NORSPEC-99 add break statement to fix legacy bump vert program from being ↵Graham Madarasz
stomped with inappropriate material prog sans skinning
2013-05-01NORSPEC-119 redux : fix getState to find the material ID of individually ↵Graham Madarasz
selected faces correctly
2013-05-01NORSPEC-145 Fix for improper rendering of glow pass for rigged meshes.Dave Parks
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-05-01More informative light func tex binding messageGraham Madarasz
2013-05-01Fix for sky being too bright with advanced lighting enabledDave Parks
2013-05-01Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-01Fix up specular highlights and gamma correction for projectors.Dave Parks
2013-05-01Add some diag for debugging light func tex bindingGraham Madarasz
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect ↵Graham Madarasz (Graham)
Mac too
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect ↵Graham Madarasz (Graham)
Mac too
2013-05-01Restore mismerged sunshine changeGraham Madarasz
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge vwr-dev-mat againGraham Madarasz
2013-04-30Fix gcc ternary type inference fail to unbreak Mac and Linux buildsGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham Madarasz
2013-04-30MATBUG-78 Fix for alpha lighting distance attenuation not matching opaque ↵Dave Parks
distance attenuation
2013-04-29NORSPEC-153 Workaround for AMD driver bug that doesn't like '\' on #define'sDave Parks
2013-04-29Merged with https://bitbucket.org/lindenlab/viewer-development-materialsGeenz
2013-04-29Fix any missing color space conversions where appropriate, tweak the sun's ↵Geenz
intensity to match pre-gamma correction results, and also mask spotlight specular by the projected texture.
2013-04-26Fix Xui cloud raining on sunshinybumpinessGraham Madarasz
2013-04-26Merge vwr-dev-matGraham Madarasz
2013-04-26MergeGraham Madarasz
2013-04-26Fix ifdefs around asserts broken in release only by mergeGraham Madarasz
2013-04-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
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
again)
2013-04-26Fix llmediadataclient test to include new dep on llprimitive and fix bogus ↵Graham Madarasz
boost lib refs in llprimitive cmake def
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-25Bump resolution on lightFunc to avoid banding.Dave Parks
2013-04-25NORSPEC-104 Fix for texture animation sometimes not overriding specular and ↵Dave Parks
normal map texture coordinates.
2013-04-25NORSPEC-106 Fix for emissive mask overriding environment mask.Dave Parks
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
open
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