summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-03-09mergeDave Parks
2010-03-09Tool tips for model preview. Rename "Impostor" to "Lowest"Dave Parks
2010-03-09We can enable alpha masking for fullbright faces as long as we're not in ↵Tofu Linden
deferred mode. Deferred masked fullbrights are still broken (we fall back to blending instead of masking as a workaround), but they always have been. :/
2010-03-09Disable alpha-masking for glowing surfaces. It seems beyond my ability to ↵Tofu Linden
get right. Refactor some replicated and/or strangely-expressed logic.
2010-03-08Mac and linux fix?Dave Parks
2010-03-08little boolDave Parks
2010-03-08Multi-threaded file dialogDave Parks
2010-03-08Remove a '#error XXX' I was using to test ifdef-hell.Tofu Linden
2010-03-08VWR-4214 followupTofu Linden
Make the fix work for alpha masks ('fast alpha') too - ironically this hasn't ever worked either AFAICT.
2010-03-08fixes VWR-4214 Glow effect passes through alpha textures where alpha is ↵Tofu Linden
actually "solid" and its many many dupes. In summary this does the following: * When laying down alpha, uses the new separated color-and-alpha blend func support to suppress existing glow in proportion to the opacity of the incoming fragments * Moves glowing-alpha support from the glow pool to the alpha pool, ensures that the glow pass for a vertex buffer happens after the alpha pass for the vertex buffer so that it doesn't suppress its *own* glow. Tested with all shader modes, FBO on/off, and deferred rendering. Tested with every permutation of alpha/non-alpha/glow/non-glow/fullbright/waterglow/particle interaction I could contrive so far. :)
2010-03-07Add support for glBlendFuncSeparate().Tofu Linden
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-03-07Add a touch of fakey ripple to shadows on the surface of water, as if the ↵Tofu Linden
water has depth. Using 4th component of the normal map to encode a position displacement (along the normal) in the class2 shadow lookup.
2010-03-07Some extra comments to help me get things straight.Tofu Linden
2010-03-07trivial comment typo fix.Tofu Linden
2010-03-07Remove an extraneous normalize() from the water fragment shader - the last ↵Tofu Linden
thing we did to this vector was normalize it anyway.
2010-03-07Remove the class2/class3 water shaders, which aren't materially different ↵Tofu Linden
from class1 except for some minor const tweaks (I've migrated class3's tweaks into class1 on the assumption that this was what davep sees all the time)
2010-03-06viewer2 merge.Tofu Linden
2010-03-06Better bounding boxes for meshes.Dave Parks
2010-03-05mergeRichard Linden
2010-03-05fixRichard Linden
2010-03-05Fix for a crash on startup/shutdown introduced in the tip of viewer-2-0 very ↵Monroe Linden
recently. list.erase(list.find()) is not safe, because erasing list.end() is undefined. Check to make sure the find succeeded before doing the erase. Reviewed by Richard at http://codereview.lindenlab.com/341001
2010-03-05mergeRichard Linden
2010-03-05added some logging to help track down crash in EXT-5849Richard Linden
2010-03-05MergeEli Linden
2010-03-05VWR-17723Eli Linden
2010-03-05VWR-17121 en_xui_changeEli Linden
2010-03-05mergeRichard Linden
2010-03-05fix for mergeRichard Linden
2010-03-05VWR-17116 en_xui_changeEli Linden
2010-03-05mergeRichard Linden
2010-03-05MergeEli Linden
2010-03-05VWR-17558 en_xui_changeEli Linden
2010-03-05VWR-17687 en_xui_changeEli Linden
2010-03-05VWR-17686Eli Linden
2010-03-05VWR-17362Eli Linden
2010-03-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2010-03-05Fix Mac llmediaplugintest build breakage.Nat Goodspeed
A viewport array passed to glGetIntegerv() and gluUnProject() was declared as 'int'. This compiles on Windows, but fails on Mac. Declaring as 'GLint' works.
2010-03-05mergePalmer
2010-03-05Only comments added to crash reporting code on handling old crash logs on ↵Palmer
mac. No code changed :)
2010-03-05viewer2 merge.Tofu Linden
2010-03-05COMMENTS!Dave Parks
2010-03-05EXT-5698 undo local FR override (not good practice); fix EN instead for ↵Eli Linden
consistency, and to allow for ES longer translation of "Buy" (Erica changed "Buy L$" to "Buy" to mitigate the problem)
2010-03-05Inventory now updates appropriately when using model uploader.Dave Parks
2010-03-05MergeEli Linden
2010-03-05beta 4 JA linguisticEli Linden
2010-03-05merge.Tofu Linden
2010-03-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-05mergeDave Parks
2010-03-05Fix for avatar eyes not showing up when deferred rendering enabled.Dave Parks
2010-03-05Fix for sun specular highlights showing up in shadow when diffuse ambiance ↵Dave Parks
greater than 0.