summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-22NORSPEC-314 WIP see if this ruse gets past the decrepit GeForce driverGraham Linden
2013-07-22Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2013-07-22CHOP-962: tag before merging in viewer-releaseNat Goodspeed
2013-07-22Removed tag CHOP-962-aNat Goodspeed
2013-07-22CHOP-962: tag before merging in viewer-releaseNat Goodspeed
2013-07-22CHOP-962: Emit unrecognized-var log message only for Global settings.Nat Goodspeed
LLControlGroup::loadFromFile() can of course detect which LLControlGroup instance it's loading. We only want to log unrecognized settings variables in LLControlGroup "Global". Settings for "Don't show me this again" notifications are in group "Warnings".
2013-07-22NORSPEC-285 NORSPEC-311 fix gamma correction of diffuse-only objects not ↵Graham Linden
matching the rest of the sRGB herd
2013-07-22NORSPEC-320 fix fullbright alpha breakage when not underwaterGraham Linden
2013-07-22Turn off logging.Aura Linden
2013-07-22MATBUG-306 fix alpha knock-on from underwater lightcurve matchingGraham Linden
2013-07-21NORSPEC-311 NORSPEC-312 make mac happy with shader ifdefs for haze/maskingGraham Linden
2013-07-21NORSPEC-311 NORSPEC-312 remove unused shader and correct default for display ↵Graham Linden
gamma exposed in settings
2013-07-21NORSPEC-311 fix alpha / opaque lighting diffsGraham Linden
2013-07-21NORSPEC-315 NORSPEC-316 NORSPEC-312 fix various haze and gamma correction ↵Graham Linden
issues, alpha-blend objects still missing haze underwater
2013-07-18Merge vwr-dev-matGraham Linden
2013-07-18NORSPEC-314 work-around mystery mac GeForce crash from new shader for nspec 295Graham Madarasz
2013-07-17NORSPEC-291 put back conversion to srgb in deferred water shaderGraham Linden
2013-07-17CHOP-962: Preserve unrecognized user settings variables.Nat Goodspeed
Change LLControlVariable::mPersist from bool to tri-state enum. Its 'true' value used to mean "persist only if changed from default;" third state now means "persist regardless of value." Add forcePersist() method to set that. Replace isSaveValueDefault() method -- used only by logic to determine whether to save the variable -- with shouldSave() method to encapsulate ALL that logic rather than only part of it. shouldSave() recognizes PERSIST_ALWAYS state. When loading an unrecognized control variable from a user settings file, use forcePersist() to ensure that we later save that variable again. Tweak one of the unit tests to adjust for new semantics.
2013-07-17NORSPEC-291 fix materials underwater, disable attempt at materials in ↵Graham Linden
reflect/distort RTs
2013-07-17CHOP-962: Make LLControlGroup::declare* return LLControlVariable*Nat Goodspeed
LLControlGroup::declareControl(), declareString() etc. etc. all used to return BOOL -- which no one ever examines because it unconditionally returned TRUE. Make it return the (possibly new) LLControlVariable* instead.
2013-07-16OPEN-182: correct tip rev number use in local build version generationOz Linden
2013-07-16CHOP-966: use 4 part version numbers for release notes urlsOz Linden
2013-07-16add contributions for MaterialsOz Linden
2013-07-16Add info to vert buffer warnings to track down fullbright alpha mask crasherGraham Linden
2013-07-16CHOP-960: Validate cmd_line.xml for map-to real settings.xml vars.Nat Goodspeed
A small, fixed set of cmd_line.xml switches can't reasonably be mapped to settings variables, mostly because they affect the settings machinery itself. Other than those, every new cmd_line.xml switch should map-to a settings variable. Validate that only the known set does not have map-to; validate that map-to variable actually exists.
2013-07-16NORSPEC-293 WIP fix fullbrightF order of ops to match non-deferred with ↵Graham Linden
fullbright+glow+texcolor
2013-07-16NORSPEC-240 revert part of change causing regression in non-ALM renderingGraham Linden
2013-07-16NORSPEC-240 make alpha-masked fullbright objs use fullbright alpha mask ↵Graham Linden
rendering
2013-07-15NORSPEC-265 WIP imposters work in non-deferred and ALM but are forward-only ↵Graham Linden
render
2013-07-15merge changes for DRTVWR-325Oz Linden
2013-07-15NORSPEC-291 first attempt at gamma correction of materials in reflectionsGraham Linden
2013-07-15merge changes for CHOP-963Oz Linden
2013-07-15merge changes for storm-1952Oz Linden
2013-07-15merge changes for DRTVWR-334Oz Linden
2013-07-15NORSPEC-291 WIP clean-up and make materials rendering underwater a runtime ↵Graham Linden
setting
2013-07-15Merge vwr-dev-matGraham Linden
2013-07-15NORSPEC-291 WIP materials working underwater and in reflection and dis ↵Graham Linden
passes, not gamma correct, needs cleanup
2013-07-13add some validation of update response before starting downloadOz Linden
2013-07-13CHOP-963: Add a new --update-service command line argument for QA useOz Linden
2013-07-12NORSPEC-291 WIP added underwater deferred program and more reflection pass workGraham Linden
2013-07-12NORSPEC-291 WIP first attempt at materials in reflection/waterdis mapsGraham Linden
2013-07-12NORSPEC-291 WIP fix materials underwater with shadows onGraham Linden
2013-07-11Merged in viewer-releaseAura Linden
2013-07-11CHOP-959: Merge About-box changes with tipNat Goodspeed
2013-07-11CHOP-959: Re-add global coordinates, plus SLURL, to About box.Nat Goodspeed
2013-07-11NORSPEC-291 really fix missing avatarGraham Madarasz (Graham)
2013-07-11NORSPEC-291 WIP fix avatar disappearingGraham Madarasz (Graham)
2013-07-11NORSPEC-291 WIP materials underwater with haze, reflection broken, water ↵Graham Madarasz (Graham)
dist broken
2013-07-10MergeGraham Linden
2013-07-10NORSPEC-291 WIP materials underwater w and wo alpha, water fog color broken, ↵Graham Linden
no refl, no water dis