Andrey Lihatskiy
|
fef6c1f51e
|
Merge branch 'master' into DRTVWR-516-maint
|
2021-06-07 20:54:41 +03: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 |
|
Andrey Kleshchev
|
3f31901640
|
Merge master (DRTVWR-515) into DRTVWR-516-maint
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/llcoros.cpp
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/llfloaterimsessiontab.cpp
|
2021-04-29 21:00:25 +03:00 |
|
Andrey Kleshchev
|
609a26b59a
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
# Conflicts:
# autobuild.xml (llca)
# indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
# indra/newview/llscenemonitor.cpp (SL-14422)
# indra/newview/llvovolume.cpp (SL-12069)
|
2021-02-01 22:28:15 +02:00 |
|
Andrey Lihatskiy
|
cd831c4228
|
Merge branch 'master' into DRTVWR-516-maint
|
2021-02-01 22:11:04 +02:00 |
|
Andrey Kleshchev
|
5691d302ef
|
SL-12069 Issues with bakes-on-mesh and alpha modes
|
2020-12-10 23:17:07 +02:00 |
|
Andrey Kleshchev
|
d1c88237c5
|
Revert "SL-12069 Issues with bakes-on-mesh and alpha modes"
This reverts commit afd734b5f4. Fix will be updated and moved to DRTVWR-515.
|
2020-12-09 23:18:20 +02:00 |
|
Andrey Lihatskiy
|
fb1238a1ce
|
Merge branch 'master' into DRTVWR-516-maint
# Conflicts:
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.cpp
# indra/newview/llenvironment.cpp
|
2020-11-13 18:26:56 +02:00 |
|
Andrey Lihatskiy
|
0303dd8179
|
Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
|
2020-11-11 22:14:24 +02:00 |
|
Andrey Kleshchev
|
3ad517c6e2
|
SL-14080 Crash in updateTextureVirtualSize
LLVOVolume::updateTextures() does not check for null drawable prior to updateTextureVirtualSize
|
2020-10-07 22:24:10 +03:00 |
|
Andrey Lihatskiy
|
83822fd199
|
Merge branch 'master' into DRTVWR-516-maint
# Conflicts:
# indra/newview/llvocache.cpp
|
2020-09-28 22:39:06 +03:00 |
|
Andrey Lihatskiy
|
32cb17e3bb
|
Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
# indra/newview/llgroupmgr.cpp
|
2020-09-28 22:24:12 +03:00 |
|
Andrey Lihatskiy
|
a2cb61d9f4
|
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# indra/newview/pipeline.cpp
|
2020-09-28 22:08:48 +03: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 |
|
Andrey Kleshchev
|
531349a2fe
|
SL-13729 Small fix with some cached settings
|
2020-09-21 14:29:47 +03:00 |
|
Andrey Kleshchev
|
45758daa8a
|
SL-3278 Small adjustement
|
2020-09-09 15:26:44 +03:00 |
|
Andrey Kleshchev
|
dceab3c78b
|
SL-3278 Compensate for randomly-switching textures
|
2020-09-08 21:43:13 +03:00 |
|
Dave Houlton
|
9f0da75332
|
Merge branch 'master' 6.4.8 into DRTVWR-497
|
2020-08-18 11:29:17 -06:00 |
|
Andrey Lihatskiy
|
4b1a0e51b0
|
Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
# indra/newview/llviewermenufile.cpp
|
2020-08-18 19:15:26 +03:00 |
|
Andrey Lihatskiy
|
a9885029cf
|
Merge branch 'master' into DRTVWR-507-maint
|
2020-08-18 19:11:34 +03:00 |
|
Andrey Lihatskiy
|
9406b757a3
|
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
|
2020-08-11 01:34:13 +03:00 |
|
Dave Houlton
|
64a9ad0f5f
|
Merge branch 'master' v6.4.6 into DRTVWR-497
|
2020-07-23 12:21:18 -06:00 |
|
Andrey Lihatskiy
|
ae48c7c8b3
|
Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
# indra/llcommon/llerror.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
|
2020-07-21 11:54:11 +03:00 |
|
Andrey Lihatskiy
|
f77a30f740
|
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# autobuild.xml
|
2020-07-21 11:30:48 +03:00 |
|
Andrey Lihatskiy
|
7bbf3f5f7f
|
Merge branch 'master' into DRTVWR-501-maint
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
|
2020-07-20 22:24:10 +03:00 |
|
Andrey Kleshchev
|
afd734b5f4
|
SL-12069 Issues with bakes-on-mesh and alpha modes
|
2020-07-02 13:36:43 +00:00 |
|
Andrey Kleshchev
|
5afedc9177
|
SL-3584 Alpha masked textures occasionally changing to alpha mode none
|
2020-06-09 18:30:48 +03:00 |
|
Mnikolenko Productengine
|
7faec04ea6
|
SL-13286 FIXED Turning off the DebugObjectLODs debug setting doesn't clear text
|
2020-05-22 18:53:48 +03:00 |
|
Nat Goodspeed
|
ca6f092929
|
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
|
2020-05-06 16:06:26 -04: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 |
|
Andrey Kleshchev
|
9c31597e5e
|
SL-13141 Crashfix contribution
|
2020-04-30 17:51:46 +03:00 |
|
Andrey Lihatskiy
|
7a311fe30e
|
Merge branch 'master' into DRTVWR-497
|
2020-04-20 21:21:12 +03:00 |
|
Rye Mutt
|
6058c49bb4
|
Merged in eep-fix-falloff-edit (pull request #54)
Fix light falloff being corrupted when editing value via build floater spinner
Approved-by: Dave Houlton
|
2020-04-01 00:25:07 +00:00 |
|
Rye Mutt
|
516ca23659
|
Update falloff fix with changes requested in review.
|
2020-03-30 23:27:04 -04:00 |
|
Rye Mutt
|
3dc71d1ce9
|
Fix light falloff being corrupted when editing value via build floater spinner
|
2020-03-30 12:53:11 -04:00 |
|
Rye Mutt
|
8e436fc396
|
Fix editing light color corrupting intensity and color values
|
2020-03-30 10:39:10 -04:00 |
|
Runitai Linden
|
e468d80186
|
SL-12902 Better fix for light color values in color swatch not matching light color values inworld.
|
2020-03-27 17:32:01 -05: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 |
|
Runitai Linden
|
d756e18573
|
SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values.
|
2020-03-26 16:48:33 -05:00 |
|
Anchor
|
32f1dfa531
|
[DRTVWR-476] - fix compiler errors 32 bit windows build
|
2020-03-25 18:44:04 -04:00 |
|
Andrey Lihatskiy
|
e0727702ea
|
Merge branch 'DRTVWR-501' into trunk
|
2020-02-03 15:18:34 +02:00 |
|
andreykproductengine
|
81c7bdea5a
|
SL-11582 Alpha mask objects with cutoff == 0 don't respond to clicks
|
2019-12-03 17:04:02 +02:00 |
|
Dave Houlton
|
dc1453af9c
|
Merge in from viewer-release 6.3.5
|
2019-11-13 16:46:27 -07:00 |
|
AndreyL ProductEngine
|
4dd3d230ec
|
Merged in lindenlab/viewer-release
|
2019-11-14 23:44:45 +02:00 |
|
andreykproductengine
|
a4199b3e3c
|
SL-12026, SL-1232 and SL-11614
|
2019-10-25 18:12:47 +03:00 |
|
andreykproductengine
|
4f5d785226
|
SL-12014 Animesh is now a separate rendering type
|
2019-10-25 17:32:19 +03:00 |
|
andreykproductengine
|
e439f0366f
|
Merge from lindenlab/viewer-release
|
2019-08-29 15:43:02 +03:00 |
|
Graham Linden
|
723f1891db
|
Merge 6.3.1 viewer-release
|
2019-08-26 12:35:18 -07:00 |
|
Brad Payne (Vir Linden)
|
bd01474e23
|
SL-11662 - apparently a race condition between image loading and material property setting
|
2019-08-15 15:08:38 +01:00 |