Brad Linden
|
c6d5f11f63
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-08-23 12:26:14 -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 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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 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 |