Beq
|
0911cae538
|
Initial merge of DRTVWR-541 into FS
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
|
2021-10-09 20:18:14 +01:00 |
|
Ptolemy
|
2508926569
|
SL-16014 Add Tracy logging to lldrawpoolavatar.cpp
|
2021-09-22 14:38:42 -07:00 |
|
Beq
|
06b663aa73
|
Impostered avatars should not cast shadows.
|
2021-09-15 21:47:24 +01:00 |
|
Runitai Linden
|
7fe2856516
|
SL-15975 Add Tracy-only profile macros that are no-ops when Tracy is disabled.
|
2021-09-15 12:41:38 -06:00 |
|
Ansariel
|
abdc9b68b8
|
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
|
2021-05-27 15:22:26 +02:00 |
|
Dave Houlton
|
7199ce4514
|
SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.
Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"
This reverts commit 5691d302ef.
|
2021-05-26 10:57:39 -06:00 |
|
Ansariel
|
a84dfcb176
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-02-18 19:32:52 +01:00 |
|
Andrey Lihatskiy
|
ba8dcf906d
|
Merge branch 'master' into DRTVWR-515-maint
|
2021-02-17 21:20:08 +02:00 |
|
Ansariel
|
b61a998574
|
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-01-17 19:29:33 +01:00 |
|
Andrey Kleshchev
|
5691d302ef
|
SL-12069 Issues with bakes-on-mesh and alpha modes
|
2020-12-10 23:17:07 +02:00 |
|
Ansariel
|
d8ec51961f
|
Merge branch 'DRTVWR-517' of https://bitbucket.org/lindenlab/viewer
|
2020-12-10 19:40:18 +01:00 |
|
Beq
|
129e77c181
|
comment out duplicate (slow)call - thanks Rye
|
2020-11-28 20:30:52 +00:00 |
|
Brad Payne (Vir Linden)
|
e3de5de3c1
|
Merge remote-tracking branch 'origin/master' into DRTVWR-517
|
2020-11-13 13:59:36 +00:00 |
|
Ansariel
|
af61974386
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-11-05 09:14:11 +01:00 |
|
Brad Payne (Vir Linden)
|
c79e648aac
|
SL-14015 - possible fix for phantom animesh attachments on mac
|
2020-11-04 16:07:10 +00:00 |
|
Ansariel
|
0bcf5a46a4
|
Small optimization for avatar rendering by NiranV Dean
|
2020-10-26 08:54:19 +01:00 |
|
Brad Payne (Vir Linden)
|
caea7260c7
|
SL-14142 - impostor management cleanup
|
2020-10-20 18:56:44 +01:00 |
|
Ansariel
|
ac94268e5e
|
Fix OpenGL core profile issue with glLineWidth by Rye Mutt
|
2020-10-18 02:21:58 +02:00 |
|
Andrey Kleshchev
|
9618df484b
|
SL-14130 Jellydolls have wrong appearance when non-impostors is uncapped
|
2020-10-16 23:16:04 +03:00 |
|
Ansariel
|
afdcfb4961
|
No need to change the matrix mode when it's not used
|
2020-10-16 21:52:04 +02:00 |
|
Ansariel
|
c8bf7a4adf
|
FIRE-29975: Fix avatar hitboxes sometimes not being drawn in correct color
|
2020-10-16 21:47:06 +02:00 |
|
Ansariel
|
b8de97f0d9
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-29 08:46:56 +02:00 |
|
Andrey Lihatskiy
|
a2cb61d9f4
|
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# indra/newview/pipeline.cpp
|
2020-09-28 22:08:48 +03:00 |
|
Brad Payne (Vir Linden)
|
376f690f8f
|
Merge remote-tracking branch 'origin/master' into DRTVWR-517
|
2020-09-28 19:51:24 +01:00 |
|
Brad Payne (Vir Linden)
|
1cba874abf
|
Merge remote-tracking branch 'origin/master' into DRTVWR-517
|
2020-09-23 20:20:27 +01:00 |
|
Ansariel
|
b5635da9e9
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-23 10:08:11 +02:00 |
|
Ansariel
|
4bbdafb17e
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2020-09-23 08:31:25 +02:00 |
|
Dave Houlton
|
86e7cc3d35
|
Merge branch 'master' v6.4.9 into DRTVWR-497
|
2020-09-22 15:28:13 -06:00 |
|
Andrey Lihatskiy
|
825cfc2b6a
|
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
|
2020-09-22 23:30:12 +03:00 |
|
Brad Payne (Vir Linden)
|
1049f15c9c
|
SL-13541 - don't show shadow of invisible avatars
|
2020-09-09 15:36:41 +01:00 |
|
Brad Payne (Vir Linden)
|
a9ddf20ff2
|
SL-13611 - make sure impostor gets drawn for initially jellydolled avatars
|
2020-07-22 17:49:45 +01:00 |
|
Ansariel
|
13086737cc
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
|
2020-05-19 21:50:44 +02:00 |
|
Ansariel
|
64f80748e7
|
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-05-18 21:50:17 +02:00 |
|
Andrey Kleshchev
|
9751942372
|
Small Cleanup
|
2020-05-18 18:33:08 +03:00 |
|
Ansariel
|
a357113793
|
Fix some merge screwup
|
2020-05-15 22:55:22 +02:00 |
|
Ansariel
|
4765655a72
|
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
|
2020-05-14 18:57:52 +02:00 |
|
Ansariel
|
dcc3871a8e
|
Fix merge screwup
|
2020-05-14 18:52:56 +02:00 |
|
Andrey Kleshchev
|
553e4e5582
|
SL-12014 fixed wrong pool type check
|
2020-05-14 11:28:16 +03:00 |
|
Ansariel
|
6afd505fa8
|
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-05-05 15:24:10 +02:00 |
|
Andrey Lihatskiy
|
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 |
|
Ansariel
|
024c357eb1
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
|
2020-04-23 18:55:47 +02:00 |
|
Brad Payne (Vir Linden)
|
4e75814b44
|
Merge remote-tracking branch 'origin/master' into SL-12995
Merge
|
2020-04-22 15:34:58 +01:00 |
|
Andrey Lihatskiy
|
7a311fe30e
|
Merge branch 'master' into DRTVWR-497
|
2020-04-20 21:21:12 +03:00 |
|
Brad Payne (Vir Linden)
|
5c7e91f62f
|
SL-12996 - replace checks of VisualMuteSettings with OverallAppearance
|
2020-04-08 14:40:01 +01:00 |
|
Andrey Kleshchev
|
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 |
|
Ansariel
|
fcdb198a62
|
Merge viewer-cougar
|
2019-12-13 17:15:37 +01:00 |
|
Ansariel
|
209f3700d1
|
Merge viewer-cougar
|
2019-10-30 18:58:52 +01:00 |
|
andreykproductengine
|
4f5d785226
|
SL-12014 Animesh is now a separate rendering type
|
2019-10-25 17:32:19 +03:00 |
|
AndreyL ProductEngine
|
6f4692bac2
|
SL-1130 Fixed crash in LLRender::loadMatrix()
|
2019-10-22 17:56:12 +03:00 |
|
Ansariel
|
6fa34eff70
|
Merge Firestorm LGPL
|
2019-10-14 18:06:42 +02:00 |