Age | Commit message (Collapse) | Author |
|
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
|
|
It seems newer compilers have a different interpretation of exactly when to
engage LLSDArray's copy constructor. In particular, this assignment:
some_LLSD_map[key] = LLSDArray(...)(...)...;
used to convert the LLSDArray object directly to LLSD; now it first calls the
custom copy constructor, which embeds the intended array within an outer array
before assigning it into the containing map.
The newer llsd::array() function avoids that problem because what it returns
is already an LLSD object.
Taking inventory of LLSDArray assignments of that form turned up a number of
workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is
both simpler and more readable.
Tip of the hat to Chorazinallen for surfacing this issue!
|
|
reading .mV[3]. Doing a detour via LLVector3 fixes this but maybe there is a less roundabout way.
|
|
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead.
|
|
|
|
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
|
|
DRTVWR-519"
This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing
changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
|
|
|
|
new lldiskcache implementation
|
|
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
|
|
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
|
|
|
|
to integer overflow: const LLExtStat LL_EXSTAT_RES_RESULT = 2L<<30; const LLExtStat LL_EXSTAT_VFS_RESULT = 3L<<30; This shifts into the sign bit and clang gets (rightfully) upset about this.
LLExtStatus needs to be at least of type U32 to remedy this problem, but
while at it it makes sense to turn it into what it is: An enum. Turning
it into a class enum has the added benefit we get type safety for mostly
free.
Which incidentally turned up a problem right away:
A call to removeAndCallbackPendingDownloads had status and extstatus
reversed and thus was wrong.
|
|
SL-13084: Fix clouds flipped along East/West axis to match texture preview Cloud Image and direction to match Cloud Scroll
SL-13804: Fix clouds flipped along East/West axis to match texture preview Cloud Image and direction to match Cloud Scroll
SL-13084: Fix inverted cloud scroll with ALM is off
SL-13084: Move texture coords section to top in class2/windlight/cloudsV to match class1/deffered/cloudsV
SL-13084: Add references to other common files
|
|
|
|
|
|
|
|
Remedy cloud_shadow and hack halving being done twice to ambient in some cases (i.e. artificial dimunition of necessary bullshit factor).
|
|
|
|
Remove all references to unused shader var global_gamma.
Remove many unused decls for gamma from shaders.
Make post-deferred gamma correction use display_gamma.
Make setting display_gamma use the correct RenderDeferredDisplayGamma setting.
|
|
Use rotated lightnorm directly in water shader instead of forcing all shaders marked as water (including lighting) to get that norm
(where it would only affect Mid as only that graphics mode has atmospherics on but isn't using deferred rendering).
|
|
|
|
Fix underwater water fog density modifier being used when not underwater.
|
|
|
|
Fix ambient light inputs to the renderer.
Fix 3rd sky shader w/ mistaken density mod conversion.
Make ambient clamp apply to all modes.
Tune ALM ambient clamp to match non-ALM.
|
|
Fix blend between reflected/refracted water maps (make less transparent)
and fix setting of water fog color alpha on low end to better match
prev behavior of setting the internal control value in that case.
|
|
|
|
|
|
Fix direct light matching across alpha/blended-material/deferred.
Get diffuse lighting to match from Low to Ultra.
|
|
New fix for 925/926 that doesn't cause 896 again.
Also linearize moon disc tex color.
|
|
Restore letting env auto-update sunlight_color uniform (other shaders expect it even if lighting does not).
|
|
Fix conversion of star brightness, density mult, and distance mult to legacy ranges.
Make settings look in both legacyhaze and top-level settings for haze params.
|
|
Fix deferred water soften prog lightnorm getting stomped with rotated lightnorm,
because it's a water shader and needs water atmo uniform values,
but it's a deferred lighting shader that needs not-so-rotated lightnorms.
Make sunlight_color not get auto-updated so we can get the correct value from mSunDiffuse.
Remove mix to preserve bumps as it was washing out shadows.
|
|
Removed refs to LAPAS. Better sync with legacy regions.
|
|
Fix distortion map rendering in deferred mode not including underwater fog effects.
Fix distortion map rendering not including post-deferred content at all.
Fix distortion map rendering not including anything but sky when camera is underwater.
Update sun_up_factor/sunmoon_glow_factor uniforms even when sun disc isn't in use.
|
|
fails.
|
|
non-ALM lighting.
|
|
from an object
|
|
|
|
|
|
|
|
|
|
Fix validating of density multiplier to clamp >= 0.0001f.
Port fix to setter for ambient color in sky settings.
|