a775b9fc7f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-04-19 15:49:47 +02:00
41cf9fcb05
SL-17028 Fix for inconsistent ordering of transparent rigged meshes and removal of glow-only rigged meshes from depth buffer.
2022-03-24 14:48:06 -05:00
381f8936f0
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llrender.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexture.cpp
2021-12-03 18:23:05 +01:00
e7830b39f0
SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey textures
2021-12-03 15:07:31 +00:00
d881fa40d3
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-20 22:35:31 +01:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
4e8cd9437b
SL-16193 Fix for mesh selection outline not rendering correctly (and broken physics shapes display).
2021-10-26 14:07:00 +00:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# 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-05-05 00:37:16 +03:00
764cb89892
SL-12824 Imported fix for crash
...
For "Face with no texture index references indexed texture draw info"
2020-03-27 16:36:31 +02:00
cb525012e7
Merge DRTVWR-440
2020-03-12 17:19:05 +01:00
edb4373f7d
SL-9775 FIXED EEP viewer crash when looking at the sun (which is playing parcel media)
2020-03-05 14:13:39 +02:00
0e7ab122ec
SL-10908 LLFace should fully rely onto drawable
2020-02-04 13:12:38 +00:00
0b6b4c7097
Merge Firestorm LGPL
2019-11-15 19:05:26 +01:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
af5779a8fa
Merge Firestorm LGPL
2019-08-14 17:37:18 +02:00
be7713cab2
Merged in lindenlab/viewer-release
2019-08-14 15:02:56 +03:00
7a64e8f8bf
Merge viewer-release 6.2.5
2019-08-13 15:24:38 -07:00
47cbcb61f8
DRTVWR-493 Cleaned up unneded inits.
2019-07-04 20:24:38 +03:00
eee343dd00
Merge viewer-cougar
2019-05-08 00:54:32 +02:00
3443ae7b26
Merge Firestorm LGPL
2019-05-02 16:48:56 +02:00
96f5fc7ce6
SL-10952 - Look at performance impact of selection outline changes
...
SL-10973 - [Love Me Render] Mesh Child Prims in Linkset are now Yellow instead of Blue -
Fixed
2019-04-22 16:32:15 +03:00
f3f75acb23
SL-10952 - Look at performance impact of selection outline changes
...
SL-10973 - [Love Me Render] Mesh Child Prims in Linkset are now Yellow instead of Blue -
Fixed
2019-04-22 16:32:15 +03:00
1d994e7702
SL-5570 - Align planar faces" does not work on normal or specular maps
...
SL-10864 -Normal and Specular textures can be rotated with checked align planar faces checkbox
Implement separate texture layers alignment.
2019-04-04 19:18:50 +03:00
637a4f0956
Merge Firestorm LGPL
2019-04-03 20:39:01 +02:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
445b66a93e
Merge viewer-cougar
2019-02-07 23:45:34 +01:00
4c0f6f5825
SL-10194 Selecting mesh face doesn't highlight the face in any way
...
- Fixed according to Steeltoe notes.
- Add const modifier for some methods
2019-01-25 18:26:42 +02:00
2e55e529d4
SL-10194 Selecting mesh face doesn't highlight the face in any way
...
- Implemented
2019-01-08 18:26:34 +02:00
9735854226
Merge Firestorm LGPL
2018-11-16 18:10:32 +01:00
35ecc970b0
Clean up unnecessary stuff and more JointMatrix Palette caching tweaks.
...
Move cache to drawable for more benefit. Reduces CPU overhead when rendering
shadows and materials by caching the jointmatrixpallette.
Sacrifices some potential cache locality but savings seem to outweigh this.
2018-11-15 20:56:35 +00:00
3af9f62d4c
Performance tweaks by reducing Matrix operations per render pass.
2018-10-28 20:39:49 +00:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
dba521acd1
[FIXED] FIRE-22379: Clearing @camtextures when the original diffuse texture of an active media prim has been swapped out triggers an LL_ERRS 'crash'
2018-06-17 00:45:50 +02:00
a0598b1265
Fix water fog consolidation in underwater shaders.
...
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-11 17:46:16 +01:00
c9e417c8a6
Merge viewer-neko
2017-11-30 01:19:29 +01:00
914e18c491
Merge viewer-neko
2017-11-18 17:06:52 +01:00
83b0467f9f
Backed out changeset: 544a91982eba
...
Originally a fix for MAINT-4773. This was causing a number of issues since
changes made in this code were pushing null textures into server and viewer
should not modify 'content' at server of own violition.
2017-11-10 20:33:51 +02:00
9de2af8b2d
MAINT-7847 Remake of 'white alpfa' fix
2017-11-13 14:26:15 +02:00
2a1d8b4632
Vectorized Weight4Strider and ClothWeightStrider by Drake Arconis (Alchemy Viewer)
2017-03-05 13:18:13 +01:00
a21ad8481e
Merged with RLVa update tip
2016-06-24 00:48:37 +02:00
70da447db9
Added @setcam_textures[:<uuid>]=n|y
...
--HG--
branch : RLVa
2016-06-19 00:38:08 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
00f53244c8
MAINT-4773 FIXED Some transparent textures are rendered as white.
...
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.
2015-01-07 02:04:03 +02:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
17df8988fe
renamed TraceType to StatType
...
added more MemTrackable types
optimized memory usage of LLTrace some more
2013-10-07 13:38:03 -07:00
Ansariel