86e7cc3d35
Merge branch 'master' v6.4.9 into DRTVWR-497
2020-09-22 15:28:13 -06: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
7a311fe30e
Merge branch 'master' into DRTVWR-497
2020-04-20 21:21:12 +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
33633361a3
Revert SL-11848 in scope of SL-12824
...
This reverts commit 8a9a929599
2020-03-27 16:11:22 +02:00
3d22273726
Fix for bad fullbright shiny shininess values and inconsistency between materialF and fullbrightShinyF
2020-03-24 11:22:01 -05: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
4be51fa559
DRTVWR-440: SL-12574: Tweak environment cube map to better match Windlight
2020-02-07 16:17:15 -08:00
fa39ff67f0
Merge branch 'master' into DRTVWR-497
2020-02-06 21:31:34 +02:00
0e7ab122ec
SL-10908 LLFace should fully rely onto drawable
2020-02-04 13:12:38 +00:00
2a6b48c9b0
DRTVWR-440, merge in latest from 6.3.7 release
2020-01-28 17:26:45 -07:00
56056aa198
Upstream merge from viewer-neko
2019-11-27 23:20:03 +02:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
5f731d84cb
Downstream merge from 494-maint-wassail
2019-11-12 02:37:15 +02:00
4dd3d230ec
Merged in lindenlab/viewer-release
2019-11-14 23:44:45 +02:00
4f5d785226
SL-12014 Animesh is now a separate rendering type
2019-10-25 17:32:19 +03:00
8a9a929599
SL-11848 Fixed login crash (Face with no texture index references indexed texture draw info)
2019-09-05 23:46:59 +03: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
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
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07: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
12cd42221e
SL-10416
...
Replace hope and asserts with checks in LLFace::setTexture in hopes of side-stepping media texture crash.
2019-01-30 08:54:29 -08:00
2e55e529d4
SL-10194 Selecting mesh face doesn't highlight the face in any way
...
- Implemented
2019-01-08 18:26:34 +02:00
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
f07dc421e8
Merge
2018-06-21 09:13:19 -07:00
9d7b353cbb
merge
2018-06-21 15:49:53 +01: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
2a2046fd07
merge
2018-06-05 22:44:04 +01:00
37e8fd20c3
Merge to 5.1.6
2018-06-01 15:34:21 +01:00
e86839fac1
SL-915 - WIP on dynamic joint box tracking
2018-06-01 15:08:59 +01:00
64302d3000
Modify use of sky settings, reduce complexity, and name funcs to indicate coord systems in use.
...
Fix class2 softenLightF shader.
2018-06-01 00:18:36 +01:00
9437d1511e
merge from viewer-release
2018-06-01 01:18:47 +03:00
439273c9c1
Merge
2018-05-23 01:16:12 +01:00
d35a8fcb3f
MAINT-8670 Crash in: LLFace::getGeometryVolume()
...
Guarded.
2018-05-22 18:18:57 +03:00
3f9b3e01b9
MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values.
2018-02-21 22:02:34 +00:00
e36745eb98
merge
2018-01-17 16:06:27 +00:00
217df36656
SL-808 - updated ARC display to largely work with animated objects. Gives some triangle information that we may or may not ultimately keep. Surface area calcs still not working
2017-10-02 21:52:24 +01:00
cbffc8194c
MAINT-7119 - [Love Me Render] Issues with RenderAutoMuteByteLimit() versus 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-03-03 16:45:46 +02:00
6770c27321
MAINT-6645 - Improvement - Agents that render as jelly dolls should have 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.
2017-01-24 15:56:25 +02:00
05d58c91ef
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-12-05 17:01:38 -05:00
d07a8b9965
SL-124 - small comment cleanups
2016-09-02 08:41:22 -04:00
72d5ff36f5
MAINT-6647 - ignore previously created slm files on model upload. SL-442 - change coloring for show bones, to highlight joint positions and rigging
2016-08-17 16:31:28 -04:00
e8aa2dd71f
x64: Do not use a union of LLColor4U. Especially having the two pointer in 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)
2016-04-22 14:58:25 +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
c686407731
MAINT-4092 FIXED Prim faces with opaque diffuse maps, with material set to ALPHA_MODE_BLEND, do not render
...
MAINT-4645 FIXED [viewer-lion] The build tool shows normal or specular map as 'none' when one exists
2014-11-13 18:47:57 +02:00
b1ef5dee93
MAINT-4619 FIXED Using Align Planar Faces on flexible prims causes viewer to crash
2014-11-04 13:07:14 +02:00
Dave Houlton