Andrey Lihatskiy
|
e3e1672ac4
|
Merge branch 'DRTVWR-599-maint-Z' into release/maint-yz
# Conflicts:
# indra/newview/llchiclet.h
|
2024-02-05 22:04:40 +02:00 |
|
RunitaiLinden
|
79f5231db2
|
Create test plan for optimizeAwayAlpha (#663)
|
2024-01-23 15:45:33 -06:00 |
|
Andrey Kleshchev
|
e5ef481cd3
|
SL-20781 Follow up on boost to std replacement
|
2024-01-09 00:19:39 +02:00 |
|
Andrey Lihatskiy
|
7d4de08fa9
|
Merge branch 'main' into DRTVWR-489
# Conflicts:
# indra/newview/llmaterialeditor.cpp
|
2024-01-08 23:49:38 +02:00 |
|
Andrey Lihatskiy
|
fee385247e
|
Merge branch 'main' into DRTVWR-594-maint-Y
|
2024-01-08 23:16:14 +02:00 |
|
Andrey Lihatskiy
|
fe796dac71
|
Merge branch 'main' into DRTVWR-588-maint-W
|
2024-01-08 23:15:00 +02:00 |
|
Andrey Kleshchev
|
afe91b7eb6
|
Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
|
2024-01-08 21:33:06 +02:00 |
|
Andrey Lihatskiy
|
c87850ddab
|
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelprofile.cpp
# indra/newview/llspatialpartition.cpp
|
2023-12-18 07:57:29 +02:00 |
|
Andrey Lihatskiy
|
aed6313d7c
|
Merge branch 'main' into DRTVWR-594-maint-Y
|
2023-12-18 06:33:57 +02:00 |
|
Andrey Lihatskiy
|
793bed7d06
|
Merge branch 'main' into DRTVWR-489
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
|
2023-12-15 07:06:15 +02:00 |
|
Brad Linden
|
4c791e098d
|
Merge remote-tracking branch 'origin/main' into DRTVWR-596
|
2023-12-14 12:07:18 -08:00 |
|
Andrey Lihatskiy
|
4b98ae6e8a
|
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
# indra/newview/llspatialpartition.cpp
|
2023-12-14 02:47:44 +02:00 |
|
Cosmic Linden
|
88b228a94d
|
Credit Henri for HUD fix
|
2023-12-13 13:39:53 -08:00 |
|
Alexander Gavriliuk
|
c9cd5631e4
|
Merge branch 'main' into DRTVWR-489
|
2023-12-05 03:37:06 +01:00 |
|
Andrey Lihatskiy
|
c409236dac
|
Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge
# Conflicts:
# indra/newview/llinventorygallery.cpp
# indra/newview/skins/default/xui/en/notifications.xml
|
2023-11-30 18:09:29 +02:00 |
|
Andrey Lihatskiy
|
27dae1d967
|
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
|
2023-11-30 13:30:27 +02:00 |
|
Andrey Lihatskiy
|
0465c761a4
|
Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
|
2023-11-30 12:28:26 +02:00 |
|
Andrey Lihatskiy
|
d1c0a5b840
|
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
|
2023-11-29 10:45:43 +02:00 |
|
Andrey Kleshchev
|
1fae237c15
|
SL-20610 Crash when unticking animesh on an attachment
|
2023-11-22 00:38:02 +02:00 |
|
Andrey Lihatskiy
|
e1fc7679f2
|
DRTVWR-594 Update contributions.txt
|
2023-11-09 23:21:18 +02:00 |
|
Andrey Lihatskiy
|
1e47b78f17
|
SL-20524 Update contributions.txt
|
2023-10-24 19:14:26 +03:00 |
|
Andrey Lihatskiy
|
e78556be9a
|
SL-20442 Update contributions.txt: name fix
|
2023-10-19 01:38:55 +03:00 |
|
Andrey Lihatskiy
|
8e7a39cfc6
|
SL-20442 Update contributions.txt
|
2023-10-19 01:32:07 +03:00 |
|
Alexander Gavriliuk
|
e7f1466a7b
|
Merge branch main into DRTVWR-489
|
2023-10-08 14:01:05 +02:00 |
|
Andrey Lihatskiy
|
d4123ec30d
|
Merge branch 'main' into DRTVWR-587-maint-V
# Conflicts:
# indra/newview/llinventorymodel.cpp
# indra/newview/llvovolume.cpp
|
2023-10-03 19:25:19 +03:00 |
|
Andrey Kleshchev
|
7d50a51434
|
Merge branch 'main' (DRTVWR-567) into DRTVWR-559
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
|
2023-10-03 19:00:33 +03:00 |
|
Andrey Kleshchev
|
fa29f4f0b1
|
SL-20224 Update contributions
Fix builds using OpenAL
|
2023-08-29 20:44:27 +03:00 |
|
Andrey Kleshchev
|
7373fd91fa
|
Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/llxml/llcontrol.cpp
# indra/newview/llpanelnearbymedia.cpp
# indra/newview/llsceneview.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llstartup.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
2023-08-24 01:23:52 +03:00 |
|
Andrey Kleshchev
|
3d73a10da3
|
Merge branch main (DRTVWR-582) into DRTVWR-567
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
|
2023-08-23 22:40:17 +03:00 |
|
Andrey Lihatskiy
|
d08859f3f4
|
Merge branch 'main' into DRTVWR-587-maint-V
# Conflicts:
# autobuild.xml
|
2023-08-23 22:28:01 +03:00 |
|
Brad Linden
|
c6d5f11f63
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-08-23 12:26:14 -07:00 |
|
Andrey Lihatskiy
|
4a19e601ea
|
SL-20054 Update contributions.txt
|
2023-07-24 20:50:24 +03:00 |
|
Callum Prentice
|
c5d7f3c4c1
|
DRTVWR-489: trivial merge conflict fix
|
2023-07-18 10:51:51 -07:00 |
|
marchcat-pe
|
37f41392cd
|
Merge pull request #285 from secondlife/marchcat/SL-19669
INTL-490 Japanese Translation Update
|
2023-07-17 23:44:34 +03:00 |
|
Brad Linden
|
f975cfd736
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-07-17 13:37:03 -07:00 |
|
Andrey Kleshchev
|
acf82867b6
|
Merge branch 'main' (DRTVWR-580) into DRTVWR-567
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodelbackgroundfetch.cpp
|
2023-07-17 23:34:59 +03:00 |
|
Andrey Lihatskiy
|
07ff9a5d67
|
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llerrorthread.cpp
|
2023-07-17 23:17:29 +03:00 |
|
Andrey Lihatskiy
|
3790c9ed87
|
INTL-490 Japanese Translation Update
provided by Logue Takacs
|
2023-05-28 06:28:30 +03:00 |
|
Andrey Lihatskiy
|
53ed0ec70c
|
Merge branch 'main' into DRTVWR-567
# Conflicts:
# doc/contributions.txt
|
2023-05-17 23:57:11 +03:00 |
|
Callum Prentice
|
f45e888c90
|
Some small tweaks after merge with Viewer release
|
2023-05-17 11:31:45 -07:00 |
|
Brad Linden
|
2f44377b3e
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-05-17 11:17:48 -07:00 |
|
Andrey Lihatskiy
|
033b04f388
|
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
|
2023-05-17 18:05:05 +03:00 |
|
Andrey Lihatskiy
|
4dcab10bf8
|
Merge branch 'main' into DRTVWR-580-maint-T
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
|
2023-05-17 17:47:45 +03:00 |
|
Andrey Kleshchev
|
250228af25
|
SL-19660 Updated contributions doc
|
2023-05-09 17:58:13 +03:00 |
|
Andrey Kleshchev
|
6d0d9b8e54
|
SL-19690 Updated contribution doc
|
2023-05-08 18:28:33 +03:00 |
|
Andrey Kleshchev
|
7ebf98713c
|
SL-19681 Updated list of contributors
|
2023-05-03 19:53:38 +03:00 |
|
Callum Prentice
|
bb96ac2621
|
MErge with main after Viewer release
|
2023-05-02 09:39:03 -07:00 |
|
Andrey Lihatskiy
|
ade8c96e5c
|
Merge branch 'main' into DRTVWR-567
# Conflicts:
# indra/newview/llappviewer.cpp
|
2023-05-02 17:57:11 +03:00 |
|
Andrey Lihatskiy
|
ff8dcc23bf
|
Merge branch 'main' into DRTVWR-577-maint-S
|
2023-05-02 17:39:37 +03:00 |
|
Andrey Lihatskiy
|
504ef7e9e3
|
Merge branch 'main' into DRTVWR-580-maint-T
|
2023-05-02 17:39:29 +03:00 |
|
Andrey Lihatskiy
|
1444c4a23c
|
Merge branch 'main' into DRTVWR-582-maint-U
|
2023-05-02 17:39:13 +03:00 |
|
Brad Linden
|
369945b45d
|
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
|
2023-04-26 15:38:47 -07:00 |
|
Alexander Gavriliuk
|
fbf5b199f3
|
SL-19575 LLFloaterEmojiPicker - code cleanup and layout fixup
|
2023-04-25 13:14:48 +02:00 |
|
Andrey Kleshchev
|
dc5ef88e31
|
SL-19623 Updated contributions
|
2023-04-19 20:31:37 +03:00 |
|
Callum Prentice
|
978a5b66f2
|
SL-19139 Credits for Kitty - update the contributors.txt file with a mention of Kitty's large contribution. (No externally facing JIRA that I can find)
|
2023-04-11 11:26:37 -07:00 |
|
Andrey Lihatskiy
|
f1095d7831
|
Merge branch 'main' into marchcat/main-contrib-merge
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/skins/default/xui/en/strings.xml
|
2023-04-07 00:20:59 +03:00 |
|
Maxim Nikolenko
|
198cd4df09
|
Merge branch 'main' into DRTVWR-567
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
|
2023-03-30 14:09:50 +03:00 |
|
Brad Linden
|
a548c16989
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-03-29 14:54:06 -07:00 |
|
Andrey Lihatskiy
|
7b2205d8f6
|
Merge branch 'main' into DRTVWR-580-maint-T
|
2023-03-30 00:39:12 +03:00 |
|
Andrey Lihatskiy
|
5217e6bfb7
|
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
|
2023-03-30 00:25:16 +03:00 |
|
Cosmic Linden
|
00997b997e
|
SL-19399: Thanks to Ai Austin for PBR material editing improvement idea
|
2023-03-22 17:11:19 -07:00 |
|
Andrey Lihatskiy
|
d080ec2808
|
SL-4126 Updated contributions.txt
|
2023-03-22 19:09:26 +02:00 |
|
Andrey Lihatskiy
|
dca3c83cd9
|
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
|
2023-03-20 01:23:16 +02:00 |
|
Rye Mutt
|
cdb3c018af
|
SL-19336 Unload avatar and group icons from memory when not visible to reduce memory pressure on extremely large friends lists
|
2023-03-03 19:44:22 +02:00 |
|
Mnikolenko Productengine
|
7298a049a7
|
SL-19317 fix for avatar attachment accounting
|
2023-03-02 18:00:11 +02:00 |
|
Andrey Kleshchev
|
4bc9331ddd
|
SL-19140 Fix contribution doc
|
2023-02-14 18:04:46 +02:00 |
|
Andrey Kleshchev
|
0630e95ce7
|
SL-19207 Update contributions document
|
2023-02-13 20:37:20 +02:00 |
|
Andrey Kleshchev
|
6c54c9f8a9
|
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
|
2023-02-09 22:33:52 +02:00 |
|
Andrey Kleshchev
|
a2f8f3db06
|
SL-19159 Update contribution doc
|
2023-02-07 23:55:22 +02:00 |
|
Maxim Nikolenko
|
51142d1341
|
Merge branch 'main' into DRTVWR-567
# Conflicts:
# indra/newview/llappearancemgr.cpp
# indra/newview/llpanelmaininventory.cpp
|
2023-02-03 16:53:33 +02:00 |
|
Mnikolenko Productengine
|
e7ba1753d2
|
Merge branch 'main' into DRTVWR-539
# Conflicts:
# doc/contributions.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
|
2023-02-03 01:46:01 +02:00 |
|
Brad Linden
|
5fabfa50d7
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-02-02 12:11:40 -08:00 |
|
Andrey Lihatskiy
|
b2e3a07ab4
|
SL-18988 Updated contributions.txt
|
2023-02-01 16:38:47 +02:00 |
|
Andrey Kleshchev
|
b5b0a3fbf6
|
SL-19110 Fix xxhash build link and properly register contribution
|
2023-01-31 22:05:42 +02:00 |
|
Andrey Kleshchev
|
8518154426
|
SL-19110 Fix xxhash build link and properly register contribution
|
2023-01-31 19:17:34 +02:00 |
|
Andrey Kleshchev
|
5d6371f568
|
SL-18937 Update contributions
|
2023-01-10 20:05:01 +02:00 |
|
Andrey Kleshchev
|
64a42aceba
|
SL-18904 Remove unused translation files
|
2023-01-04 23:52:41 +02:00 |
|
Andrey Kleshchev
|
5ea7cec092
|
SL-18893 Update list of contributors
|
2023-01-04 22:21:20 +02:00 |
|
Andrey Kleshchev
|
0ffe9ff0ae
|
SL-15175 Updates for TP states while the viewer is minimized
|
2022-12-13 21:25:16 +02:00 |
|
Mnikolenko Productengine
|
553a98723b
|
Merge branch 'main' into DRTVWR-539
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/colors.xml
|
2022-12-13 08:05:03 +02:00 |
|
Callum Prentice
|
f7838ca17c
|
Merge branch 'main' into DRTVWR-568
|
2022-12-12 11:13:10 -08:00 |
|
Andrey Lihatskiy
|
f836194516
|
Merge branch 'main' into DRTVWR-570-maint-Q
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
|
2022-12-12 20:53:11 +02:00 |
|
Andrey Lihatskiy
|
b4dd4271a1
|
SL-16874 Added tool tips to buttons displayed by llDialog()
|
2022-12-12 20:22:50 +02:00 |
|
Mnikolenko Productengine
|
de0317cc3f
|
Merge branch 'DRTVWR-568' into DRTVWR-539
|
2022-11-22 23:12:05 +02:00 |
|
Mnikolenko Productengine
|
daa1257466
|
Merge branch 'master' into DRTVWR-539
|
2022-11-22 17:38:01 +02:00 |
|
Andrey Lihatskiy
|
25c62f554f
|
Merge branch 'master' into DRTVWR-570-maint-Q
|
2022-11-21 22:46:35 +02:00 |
|
Andrey Kleshchev
|
96f0c95898
|
Merge branch master into DRTVWR-565-maint-P
|
2022-11-21 20:48:24 +02:00 |
|
Kyler Eastridge
|
35d2771cd3
|
Fix spelling error on license file name
|
2022-11-18 06:23:11 -05:00 |
|
Kyler Eastridge
|
4a33a0edb2
|
Fix readme logo for dark theme sites
|
2022-11-18 06:22:43 -05:00 |
|
Andrey Lihatskiy
|
24993a914f
|
SL-18637 Reverted material shader changes
original fix by Beq Janus
|
2022-11-14 23:58:14 +02:00 |
|
Mnikolenko Productengine
|
72b1cfc76b
|
SL-18586 FIXED Crash when opening 360 snapshot
|
2022-11-09 14:42:27 +02:00 |
|
Andrey Lihatskiy
|
55c27641fe
|
Merge remote-tracking branch 'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q
|
2022-11-09 00:45:01 +02:00 |
|
Andrey Lihatskiy
|
2904062948
|
Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-Q
|
2022-11-09 00:41:58 +02:00 |
|
Andrey Lihatskiy
|
67ce0e77d7
|
Merge remote-tracking branch 'RyeMutt/viewer/mac-fixes' into DRTVWR-570-maint-Q
|
2022-11-02 18:50:18 +02:00 |
|
Andrey Lihatskiy
|
39e08b34b1
|
Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q
|
2022-11-01 23:11:57 +02:00 |
|
Andrey Lihatskiy
|
d4d5d4018d
|
Merge remote-tracking branch 'RyeMutt/viewer/datapacker-crashfixes/datapacker-crashfixes' into DRTVWR-570-maint-Q
|
2022-10-29 00:32:59 +03:00 |
|
Mnikolenko Productengine
|
0aabcf9a85
|
Merge branch 'master' into DRTVWR-539
|
2022-10-27 14:23:42 +03:00 |
|
Andrey Lihatskiy
|
b8f75bd161
|
Merge branch 'master' into DRTVWR-570-maint-Q
|
2022-10-26 23:58:06 +03:00 |
|
Callum Linden
|
aad3b32a92
|
Merge branch 'master' into DRTVWR-568
|
2022-10-26 12:07:12 -07:00 |
|
Callum Linden
|
80585d56fd
|
Merge master into DRTVWR-568 (and fix conflicts)
|
2022-10-24 17:48:16 -07:00 |