summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Collapse)Author
2018-08-06MergeGraham Linden
2018-08-06MergeGraham Linden
2018-08-06WIP check-in to allow merge of upstream changes.Graham Linden
2018-08-06MAINT-8952 EEP Changing one Day Cycle Keyframe can change other keyframesandreykproductengine
2018-08-03Synch settings with simulator.Rider Linden
2018-08-03MAINT-7699: More robust cap protocol, better support for delete and support ↵Rider Linden
for individual tracks, support for setting environment by asset id in the cap MAINT-7703: Initial flags sent in message protocol for parcels
2018-07-30MAINT-8904: Creating new setting in inventory now causes simulator to assign ↵Rider Linden
default asset ID to inventory item.
2018-07-16Add default and wellknown asset ids.Rider Linden
2018-07-11Minor change from the simulator to throttle the minimum blend in a time ↵Rider Linden
based blend.
2018-07-10Support blending current/next bloom textures in deferred star rendering.Graham Linden
2018-07-03MergeRider Linden
2018-07-03MAINT-8821: New "My Environments" floater. First pass.Rider Linden
2018-07-03MAINT-8838 render a sun disc if the texture(s) are provided by WL settings ↵Graham Linden
(default is no sun disc and just haze) Refactor sky texture optimization to retain building the cubemap used by shiny.
2018-07-02MAINT-8837 fix legacy haze validation to make all params optionalGraham Linden
2018-06-29MergeRider Linden
2018-06-29Enable settings inventory filter checkbox. Fix day cycle editor selection ↵Rider Linden
on open.
2018-06-29MergeGraham Linden
2018-06-29MAINT-8817 remove automatic update of inv_proj matrix so sunLightF which ↵Graham Linden
expects it not to match the projection mat works again Fix misspellinging in missing settings asset notification string Fix moon quat conversion to get proper directional rotation Add early out so attempting to set parcel env settings doesn't crash
2018-06-29Fix moon rotation.Rider Linden
2018-06-28Creating settings objects in the correct folders. Correctly check if clouds ↵Rider Linden
paused.
2018-06-28MergeRider Linden
2018-06-27MAINT-8011 make newly created Sky, Water, etc create a system folder with ↵Graham Linden
proper icon Add entries to strings.xml for all langs for the "settings" string.
2018-06-27Make distinct ALM moon shader, tweak mix factor for day vs night moon ↵Graham Linden
shading, and fix transposed name of daycycle func.
2018-06-25Pair of LOG_CLASS macros (from simulator)Rider Linden
2018-06-25MergeRider Linden
2018-06-25Fix cloud scroll adjustment in the editor, pause clouds method, set sun disk ↵Rider Linden
UUID to null.
2018-06-25Clean up spaces vs tabs to match sim side code.Graham Linden
2018-06-25Better method for deriving sun/moon quaternions from east/sun angle defs in ↵Graham Linden
legacy sky settings XML. Avoid using static const DUE_EAST due to CRT init order issues w/ GCC.
2018-06-22Fix double blend and warnings reported as errors.Graham Linden
2018-06-22Make LLSettingsFoo::defaults() funcs only calculate the invariant values ↵Graham Linden
once (use static trick ala the validations). Fix conversion of legacy settings w/ non-zero east angles to account for those values being CW radian angles.
2018-06-21Fix double-def of IMG_BLOOM1 from pulling over server change not needed in ↵Graham Linden
viewer code. Make viewer code use LLSettingsSky static func to hide indraconstants dep.
2018-06-21Merge 5.1.7Graham Linden
2018-06-21Merge server side bugfixes over.Graham Linden
2018-06-15Make water and sky defaults take a position value to allow for default ↵Graham Linden
daycycle w/ multiple frames. Make default daycycle add 8 frames at 0, 0.125, 0.25 etc Merge over server-side bugfixes. Eliminate extraneous dirty bits in sky settings.
2018-06-13Mods to hook up water settings to water normals for rendering with support ↵Graham Linden
for current to next blending. Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings. Remove all references to gSun/MoonTextureId globals (they should come from sky settings now).
2018-06-12MergeRider Linden
2018-06-12Time threshold on timer based updates. Editor can replace frame with one ↵Rider Linden
from inventory. Extra check on adding a frame type.
2018-06-12Fix env panel forward action.Graham Linden
Make env panel update environment when jumping frame to frame. Add separate funcs for sun/moon vectors in various coord systems. Make haze glow only pay attention to sun (i.e. fix sun glow when moon is near horizon in daytime).
2018-06-11Remove debug pragma and put setMoonRotation back in the header file.Graham Linden
2018-06-11Make cloud rendering use textures defined in sky settings and add code to ↵Graham Linden
shaders to lerp between current and next cloud texture.
2018-06-11MergeGraham Linden
2018-06-11Fix water fog consolidation in underwater shaders.Graham Linden
Add plumbing facilities to allow current and next moon textures to be passed to moon shader. Modify moon shader to blend between current and next moon textures by blend factor.
2018-06-08Settings inventory picker.Rider Linden
2018-06-19Don't recalculate lighting every frame. Fix altitude transitions. On track ↵Rider Linden
switch ignore time threshold on blender.
2018-06-19Adding some timers for trackingRider Linden
2018-06-06MergeRider Linden
2018-06-06Various editor fixes. Start adding a settings picker.Rider Linden
2018-06-06Fix legacy haze validation returning warnings as errors.Graham Linden
Add assert that calculated spans are > 0 to avoid div by 0 NaNs. Make span calc return 1.0 for case where begin == end. Fix order of ops in LLTrackBlenderLoopingTime ctor causing skies to be init'd with water instances.
2018-06-05EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironmentRider Linden
2018-06-05Fix uninit data from deleting c++11-style init and not putting it in the ctor.Graham Linden
Replace dynamic_pointer_cast so instance isn't accidentally deleted on func exit.