summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-22fixed crash on exitRichard Linden
2013-07-22BUILDFIX: missing includeRichard Linden
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-22BUILDFIX: point at newest version of llappearanceutilityRichard Linden
2013-07-22NORSPEC-320 fix fullbright alpha breakage when not underwaterGraham Linden
2013-07-22Turn off logging.Aura Linden
2013-07-22Automated merge with https://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-07-22BUIDLFIX: moved LLThreadSafeRefCount to proper fileRichard 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-20removed debug spamRichard Linden
fast timer data now resets on login
2013-07-19BUILDFIX: #include and dependency cleanupRichard Linden
2013-07-19Automated merge with https://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-07-18SH-4297 WIP interesting: viewer-interesting starts loading cached scene lateRichard Linden
dependency cleanup - removed a lot of unecessary includes
2013-07-18SH-4297 WIP interesting: viewer-interesting starts loading cached scene lateRichard Linden
fixed ostream precision munging in llsys
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-17SH-4299 WIP: Interesting: High fps shown temporarily off scale in statistics ↵Richard Linden
console made unit types work with ostreams fixed timing of scene monitor recordings to better respect requested time diff
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-15SH-4299 FIX: Interesting: High fps shown temporarily off scale in statistics ↵Richard Linden
console timing of scene load recording extension now guaranteed > requested time step removed double add of recorded data removed spam
2013-07-15NORSPEC-265 WIP imposters work in non-deferred and ALM but are forward-only ↵Graham Linden
render
2013-07-15MAINT-2849 FIX Certain streams that play with FMod do not play with FModExcallum_linden
2013-07-15BUILDFIX: improper type passed to llformatRichard Linden
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-15BUILDFIX: remove ambiguity of is_approx_equal, use llabs instead of fabsRichard Linden
2013-07-15Automated merge with https://bitbucket.org/lindenlab/viewer-interestingRichard Linden