summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05correct coding standards problemsOz Linden
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05Merge viewer-release with Vivox codesimon
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05increment viewer version to 3.6.3Oz Linden
2013-08-05NORSPEC-304 NORSPEC-336 another attempt as resolving black glow overdraw ↵Graham Madarasz (Graham Linden)
without breaking glow (even for alpha-blended) faces
2013-08-05NORSPEC-336 intentionally rebreak 304 to fix glow while we find a fix that ↵Graham Linden
works for both
2013-08-05NORSPEC-285 NORSPEC-293 NORSPEC-298 fix ighting diffs between ↵Graham Linden
alpha/non/ALM/non-ALM
2013-08-04NORSPEC-305 -NORSPEC-335 fix scale and HUD anim regression from materials ↵Graham Linden
changes in CL 28424
2013-08-03NORSPEC-332 fix fullbright tex indexing failGraham Linden
2013-08-03NORSPEC-304 NORSPEC-334 NORSPEC-336 fix black glow overdraw without breaking ↵Graham Linden
glow
2013-08-02CHOP-959: merge --graphicslevel fix up to tipNat Goodspeed
2013-08-02CHOP-959: Honor --graphicslevel switch even on first viewer run.Nat Goodspeed
Previous CHOP-959 logic set a flag to remember that settings variable RenderQualityPerformance was set (by --graphicslevel), so it could be applied once LLViewerWindow is constructed. But on first viewer run, LLViewerWindow constructor calls LLFeatureManager::applyRecommendedSettings(), which resets that settings variable! So don't just set a flag, actually capture the requested RenderQualityPerformance value for later.
2013-08-01NORSPEC-336 fix glow regression from 304 fixGraham Linden
2013-08-01MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner"simon
2013-08-01MAINT-2949 : Objects across the sim border do not render when approached. Addedsimon
missing code block from previous change as per Dave P's advice
2013-08-01NORSPEC-304 fix glow pass rendering over alpha pass after ALM toggleGraham Madarasz (Graham Linden)
2013-07-30MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexessimon
bullet-proof. Reviewed by Kelly
2013-07-30NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehowGraham Linden
2013-07-30NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac ↵Graham Madarasz (Graham Linden)
10.6.8 nV driver issues
2013-07-30MAINT-2939 FIXED [CHUI] On Windows machine location address bar in viewer ↵maksymsproductengine
goes blank if location is selected and a menu item is seleted
2013-07-30Adding a non-code change to force a rebuild of the CHUI RC to avoid CHOP-100Steven Harrison (steven)
2013-07-29Slowest debug in the west.Aura Linden
2013-07-29I love issues that only reproduce via teamcityAura Linden
2013-07-29NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on MacGraham Madarasz (Graham Linden)
2013-07-28NORSPEC-314 fixed another mac-specific stupidity by splitting out a new ↵Graham Madarasz
srgb_mac version of the shader
2013-07-28NORSPEC-323 fix norm/tangent gen for prim capsGraham 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-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