summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
AgeCommit message (Collapse)Author
2020-09-28Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llgroupmgr.cpp
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-07-02SL-12069 Issues with bakes-on-mesh and alpha modesAndrey Kleshchev
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-04-20Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-03-27SL-12824 Imported fix for crashAndrey Kleshchev
For "Face with no texture index references indexed texture draw info"
2020-03-27Revert SL-11848 in scope of SL-12824Andrey Kleshchev
This reverts commit 8a9a9295999a67e97b16c3e0ff4b9fdfd8298904.
2020-03-24Fix for bad fullbright shiny shininess values and inconsistency between ↵Runitai Linden
materialF and fullbrightShinyF
2020-03-05SL-9775 FIXED EEP viewer crash when looking at the sun (which is playing ↵maxim_productengine
parcel media)
2020-02-07DRTVWR-440: SL-12574: Tweak environment cube map to better match WindlightPtolemy
2020-02-06Merge branch 'master' into DRTVWR-497Andrey Lihatskiy
2020-02-04SL-10908 LLFace should fully rely onto drawableAndrey Kleshchev
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2019-11-27Upstream merge from viewer-nekoAndreyL ProductEngine
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-12Downstream merge from 494-maint-wassailAndreyL ProductEngine
2019-11-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-10-25SL-12014 Animesh is now a separate rendering typeandreykproductengine
2019-09-05SL-11848 Fixed login crash (Face with no texture index references indexed ↵AndreyL ProductEngine
texture draw info)
2019-08-14Merged in lindenlab/viewer-releaseandreykproductengine
2019-08-13Merge viewer-release 6.2.5Graham Linden
2019-07-04DRTVWR-493 Cleaned up unneded inits.andreykproductengine
2019-04-22SL-10952 - Look at performance impact of selection outline changesruslantproductengine
SL-10973 - [Love Me Render] Mesh Child Prims in Linkset are now Yellow instead of Blue - Fixed
2019-04-04SL-5570 - Align planar faces" does not work on normal or specular mapsruslantproductengine
SL-10864 -Normal and Specular textures can be rotated with checked align planar faces checkbox Implement separate texture layers alignment.
2019-04-02Merge 6.1.2 LoveMeRender new hotnessGraham Linden
2019-01-25SL-10194 Selecting mesh face doesn't highlight the face in any wayruslantproductengine
- Fixed according to Steeltoe notes. - Add const modifier for some methods
2019-01-30SL-10416Graham Linden
Replace hope and asserts with checks in LLFace::setTexture in hopes of side-stepping media texture crash.
2019-01-08SL-10194 Selecting mesh face doesn't highlight the face in any wayruslantproductengine
- Implemented
2018-11-14MergeRider Linden
2018-06-21MergeRider Linden
2018-06-21mergeBrad Payne (Vir 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-05mergeBrad Payne (Vir Linden)
2018-06-01Merge to 5.1.6Graham Linden
2018-06-01SL-915 - WIP on dynamic joint box trackingBrad Payne (Vir Linden)
2018-06-01Modify use of sky settings, reduce complexity, and name funcs to indicate ↵Graham Linden
coord systems in use. Fix class2 softenLightF shader.
2018-06-01merge from viewer-releaseandreykproductengine
2018-05-23MergeGraham Linden graham@lindenlab.com
2018-05-22MAINT-8670 Crash in: LLFace::getGeometryVolume()ruslantproductengine
Guarded.
2018-02-21MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low ↵Brad Payne (Vir Linden)
values.
2018-01-17mergeBrad Payne (Vir Linden)
2017-10-02SL-808 - updated ARC display to largely work with animated objects. Gives ↵Brad Payne (Vir Linden)
some triangle information that we may or may not ultimately keep. Surface area calcs still not working
2017-03-03MAINT-7119 - [Love Me Render] Issues with RenderAutoMuteByteLimit() versus ↵ruslantproductengine
worn legacy prims, sculpts and non-rigged mesh. FIXED. Remark: for Linux platform, for the best times, when we will use gcc > 4.6, otherwise ICE :-(
2017-01-24MAINT-6645 - Improvement - Agents that render as jelly dolls should have ↵ruslantproductengine
their attachments render at 0 LoD to prevent loading higher LoD complexity in memory thus deterring crashes. Comments: - Fix based on "RenderAutoMuteByteLimit" setting. - File indra/llxml/llcontrol.h - add all signals to 0 group. It garanty that handlers (in indra/newview/llviewercontrol.cpp) will be called last.
2016-12-05Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-09-02SL-124 - small comment cleanupsBrad Payne (Vir Linden)
2016-08-17MAINT-6647 - ignore previously created slm files on model upload. SL-442 - ↵Brad Payne (Vir Linden)
change coloring for show bones, to highlight joint positions and rigging
2016-04-22x64: Do not use a union of LLColor4U. Especially having the two pointer in ↵Nicky
there will blow up the struct to at least 8 byte, which will break VBO packing as this class needs to be 4 byte in size. (transplanted from 847df86d6b5daa69dcfc428df18876a9c1e8bef6)
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-01-07MAINT-4773 FIXED Some transparent textures are rendered as white.ruslantproductengine
This bug fix related also to MAINT-4092. In 4092 sometimes when we don't have information about the texture during the setup the materail (LLVOVolume::setTEMaterialParams()), we should substitute the material with disabled "diffuse alpha mode" (for detail in cases see MAINT-4092 JIRA ticket comment). This bug fix cover the case when after the loading texture we have all information about alpha mode, and in this case we should restore diffuse alpha mode if need. In short: now we always believe that information about the material is valid (LLVOVolume::setTEMaterialParams()). Of course before setup it we check information about texture (if it possible) , if texture is not exist in database or not 32 bit depth (for diffuse) we made changes. But in all other cases (if we can't receive information about texture) we remeber this case in mWaitingTextureInfo multimap. When information about texture will be available we get it in: LLVOVolume::notify AboutCreatingTexture() or Volume::notifyAboutMissingAsset() and again, we recheck it and if need change (substitute) the material parameters. I suppose that this solution is better than was before. If this patch will be accepted , I think that MAINT-4092 should be rechecked again.