summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-07-26CHOP-955: merge viewer_manifest.py file_list fixNat Goodspeed
2013-07-26CHOP-955: Include app_settings/settings_install.xml in file_list.Nat Goodspeed
viewer_manifest.py uses its base-class llmanifest.LLManifest.put_in_file() method to create several different files in the install image being marshalled. I based the logic to create settings_install.xml on that example. Unfortunately I failed to notice that after every existing call, the script also explicitly appended the newly-created file to self.file_list... which only matters on Windows. file_list is fed to the NSIS installer. Change put_in_file() method to implicitly append to self.file_list. Change every existing viewer_manifest.py call to pass new put_in_file(src=) param instead of explicitly appending to self.file_list.
2013-07-26Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951Nat Goodspeed
2013-07-26CHOP-962: merge code-review fixes with viewer-releaseNat Goodspeed
2013-07-26CHOP-962: per code review, comment that other code relies on "Global".Nat Goodspeed
The comment advises grepping for "Global" rather than specifically pointing to llcontrol.cpp because that's NOT the only place that relies on the name "Global"! Besides, by the time someone does want to change the name, still other such dependencies could've crept in.
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
Initial change made LLControlVariable::mPersist an enum, but retained bool/BOOL public API. setPersist(true) set one value, setPersist(false) set another, forcePersist() set the third. Per code review, expose enum to public, make setPersist() (and LLControlVariable constructor, and LLControlGroup:: declareControl(), and all the LLControlGroup::declareMumble() methods, and all the unit-test dummy declareMumble() method bodies) accept that enum. Remove forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly. Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25Kill all the vivox logsAura Linden
2013-07-25Make use of vertex_color selectable per shader with alphaF/alphaV againGraham Linden
2013-07-25NORSPEC-324 set gamma value for avatar alpha shader too for gamma correct ↵Graham Linden
eyelashes
2013-07-25NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB ↵Graham Linden
conversion in one place
2013-07-24NORSPEC-326 eliminate identity theft causing mac nV mobile shader ↵Graham Linden
compilation fail
2013-07-24NORSPEC-324 when using display_gamma, actually set display_gammaGraham Linden
2013-07-24added default sourceid and check that sourceid is not blank, hoping to get ↵JJ Linden
the windows builds to recognize the value
2013-07-24MATBUG-306 regression fix, vert color applied in wrong colorspaceGraham Linden
2013-07-24merge up to latest snowstorm integration branchOz Linden
2013-07-24NORSPEC-311 WIP move to per-pixel alpha lighting and make spot/point calcs ↵Graham Linden
match more closely
2013-07-24NORSPEC-314 fix discrepancies between alpha and non-alpha deferred ↵Graham Linden
point/spot atten
2013-07-24MATBUG-315 remove unused uniforms from depth downsample frag shaders as they ↵Graham Linden
anger some shader compilers despite not being used
2013-07-24NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as ↵Graham Linden
deferred (opaque objects)
2013-07-23NORSPEC-293 fix sRGB to linear conversion to not scrooge the darksGraham Linden
2013-07-23NORSPEC-285 NORSPEC-298 alpha vs diff color differencesGraham Linden
2013-07-23NORSPEC-314 make work-around apply to all Macs for nowGraham Linden
2013-07-23Fix regression causing fullbright alpha-masked objects to be opaqueGraham Linden
2013-07-23NORSPEC-293 hazy glowing fullbright begoneGraham Linden
2013-07-23Fix for BUG-3363. We have an array of URLs, and we need the paths of those ↵Geenz
URLs. Explicitly get the path.
2013-07-23Fix for BUG-3364Geenz
2013-07-23NORSPEC-314 WIP make work-around easier to flip and add 9800M as an evil macGraham Linden
2013-07-23CHUI-986 FIXED Don't open Conversation floater for offline IMs if it's not ↵Mnikolenko ProductEngine
from group or friend.
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: 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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 16:27:21 +0000