summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-28Merge vwr-dev-matGraham Linden
2013-07-28NORSPEC-314 fix the fullbright alpha mask logicGraham Madarasz
2013-07-26NORSPEC-327 modify 'select' ops in srgb shader code to mollify the doddering ↵Graham Linden
mac GLSL compiler
2013-07-26NORSPEC-327 modify 'select' ops in srgb shader code to mollify the doddering ↵Graham Linden
mac GLSL compiler
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-25Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-07-25fix for SH-4298: Interesting: Viewer crash in LLViewerOctreeCull andXiaohong Bao
SH-4341: Interesting: Viewer crash in LLViewerOctreeCull
2013-07-25BUIDLFIX: bad ternary expressionRichard Linden
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-24SH-4297 WIP interesting: viewer-interesting starts loading cached scene lateRichard Linden
added commented out log timestamp override for scene load performance monitoring
2013-07-24BUIDLFIX: forgot to extract value from units object for calling llformatRichard Linden
2013-07-24SH-4376 FIX: Interesting: in Statistics, replace the text "0" with "n/a" whenRichard Linden
there are no samples during the time period. added hasValue to SampleAccumulator so we don't print a value when we don't have a single sample yet added some disabled log output for scene load timing
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-24BUILDFIX: add iostream include for linux_updater.cppRichard Linden
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-24BUILDFIX fixed llunits unit test to use new unit declaration syntaxRichard Linden
2013-07-24NORSPEC-311 WIP move to per-pixel alpha lighting and make spot/point calcs ↵Graham Linden
match more closely
2013-07-24Automated merge with https://bitbucket.org/lindenlab/viewer-interestingRichard Linden
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-23Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-07-23MergeXiaohong Bao
2013-07-23renamed mVarianceSum to mSumOfSquares to be more clearRichard Linden
fixed normalization assertions to work with megaprims added is_zero() utility function fixed unit declarations to be more clear fixed texture cache hit rate always being 0
2013-07-23SH-4366 FIX: Interesting Viewer Crashes when opening Statistics floaterRichard Linden
2013-07-23stat bars with no stats now show n/a instead of oRichard Linden
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: tag before merging in viewer-releaseNat Goodspeed
2013-07-22Removed tag CHOP-962-aNat Goodspeed
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-20 06:21:04 +0000