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 |
|
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 |
|
Andrey Lihatskiy
|
439aa79414
|
SL-18432 Fix for alpha sorting
|
2022-10-24 22:14:20 +03:00 |
|
Mnikolenko Productengine
|
717b34f53f
|
Merge branch 'master' into DRTVWR-539
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
|
2022-10-21 14:42:53 +03:00 |
|
Andrey Lihatskiy
|
e0ace0c722
|
Merge branch 'master' into DRTVWR-570-maint-Q
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
|
2022-10-20 22:34:11 +03:00 |
|
Andrey Lihatskiy
|
f0cd5407c4
|
SL-18412 Merge remote-tracking branch 'RyeMutt/viewer/menu-leaks' into DRTVWR-570-maint-Q
|
2022-10-19 23:53:53 +03:00 |
|
Mnikolenko Productengine
|
dbbc710739
|
SL-18348 FIXED Include next/previous face doesn't work
|
2022-10-13 14:39:29 +03:00 |
|
Andrey Kleshchev
|
338aeef7e9
|
SL-14696 SL-13629 Re-add gradation fix after merging a contribution
|
2022-10-01 00:48:25 +03:00 |
|
Andrey Kleshchev
|
6614a6ee99
|
SL-18249 Optimizations to mesh and material loading
|
2022-09-28 18:42:10 +03:00 |
|
Mnikolenko Productengine
|
198420f9f6
|
SL-18248 Move frame breakdown stats to 'Scene loading statistics' floater
|
2022-09-28 14:16:16 +03:00 |
|
Andrey Kleshchev
|
9bad5d08fb
|
SL-17238 Large cmake contribution by NickyD
|
2022-09-17 19:30:31 +03:00 |
|
Andrey Lihatskiy
|
a9a63db0f0
|
Merge branch 'master' into DRTVWR-548-maint-N
|
2022-08-31 00:17:37 +03:00 |
|
Andrey Lihatskiy
|
2e837e5389
|
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
|
2022-06-29 20:51:08 +03:00 |
|
Andrey Kleshchev
|
1b369c7f10
|
Merge branch 'master' (DRTVWR-543) into DRTVWR-483
# Conflicts:
# indra/newview/llviewertexturelist.cpp
|
2022-06-29 18:30:05 +03:00 |
|
Maxim Nikolenko
|
1167ea994c
|
SL-17634 Replace deprecated carbon Gestalt calls
|
2022-06-22 18:00:49 +03:00 |
|
Andrey Kleshchev
|
791b7ff0e9
|
SL-17585 Don't bother users with dialogs if we are already quiting
|
2022-06-20 17:07:49 +03:00 |
|
Andrey Lihatskiy
|
3da7a50b71
|
Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
|
2022-05-27 02:51:33 +03:00 |
|
Andrey Lihatskiy
|
2ed401882e
|
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewertexturelist.cpp
|
2022-05-26 02:56:29 +03:00 |
|
Nat Goodspeed
|
4e282db26b
|
SL-17218: Credit NickyD's contributions to this Jira.
|
2022-04-14 15:32:19 -04:00 |
|
Andrey Kleshchev
|
51e318fd8d
|
SL-14541 Pull in updated zlib-ng
Nicky Dasmijn's contribution for zlib-ng Linux builds
|
2022-03-05 11:34:13 +02:00 |
|
Andrey Kleshchev
|
97a103255e
|
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
|
2022-03-01 13:41:42 +02:00 |
|
Andrey Lihatskiy
|
e70fe3a50d
|
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewermenu.cpp
|
2022-02-28 22:01:18 +02:00 |
|
Andrey Lihatskiy
|
0bef5e553e
|
Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects"
This reverts commit 8215fff0c2.
# Conflicts:
# indra/newview/lltoolpie.cpp
|
2022-01-21 19:13:28 +02:00 |
|
Andrey Lihatskiy
|
469ce7f7f6
|
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
|
2022-01-10 23:51:52 +02:00 |
|
Andrey Lihatskiy
|
b33e18585d
|
Merge branch 'master' into DRTVWR-483
|
2021-12-26 14:00:00 +02:00 |
|
Dave Houlton
|
cf35d27dfb
|
DRTVWR-546 merge up to 6.5.2
|
2021-12-15 14:37:18 -07:00 |
|
Andrey Lihatskiy
|
edb6293528
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-12-15 21:50:40 +02:00 |
|
Andrey Kleshchev
|
7c1cd47772
|
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
|
2021-12-15 21:16:47 +02:00 |
|
Andrey Kleshchev
|
442abdaac7
|
SL-16438 Machine id for Linux is always 0
|
2021-12-03 00:49:33 +02:00 |
|
Dave Houlton
|
353329c2c2
|
DRTVWR-546 merge in master v6.5.1
|
2021-11-16 11:44:55 -07:00 |
|
Andrey Lihatskiy
|
981cdca0a5
|
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/llui/lltextbase.h
# indra/newview/VIEWER_VERSION.txt
|
2021-11-16 01:34:29 +02:00 |
|
Andrey Lihatskiy
|
0bffd3d365
|
Merge branch 'master' into DRTVWR-519
# Conflicts:
# README.md
|
2021-11-16 01:21:05 +02:00 |
|
Andrey Lihatskiy
|
30c381406c
|
Merge branch 'master' into DRTVWR-530-maint
# Conflicts:
# doc/contributions.txt
|
2021-11-16 01:09:11 +02:00 |
|
Andrey Lihatskiy
|
f9373a9b4e
|
Merge branch 'master' into DRTVWR-527-maint
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
|
2021-11-16 00:54:53 +02:00 |
|
Ptolemy
|
ad91d0fd92
|
SL-16127: Make another pass removing redundant LLSD op [] calls, unused vars, and use atmospheric already calculated
|
2021-10-27 10:05:13 -07:00 |
|
Mnikolenko Productengine
|
a68ca665ad
|
SL-15958 Stop impostored avatars from casting shadows
|
2021-09-22 17:51:00 +03:00 |
|
Mnikolenko Productengine
|
bbd5a9c62b
|
SL-16021 FIXED impostors are creating full detailed shadows
|
2021-09-17 15:29:00 +03:00 |
|
Ptolemy
|
df5127136f
|
SL-15709: Add Tracy support to viewer
|
2021-09-03 17:53:43 -07:00 |
|
Andrey Lihatskiy
|
b18f328c08
|
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
|
2021-09-03 00:18:26 +03:00 |
|
Andrey Lihatskiy
|
638fe87576
|
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelpicks.h
# indra/newview/llviewerfloaterreg.cpp
|
2021-07-23 07:10:26 +03:00 |
|
Andrey Lihatskiy
|
6c8e6f033b
|
Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
|
2021-07-20 02:48:05 +03:00 |
|
Callum Prentice
|
8631a7a077
|
Merge with tip of Master after a Viewer release
|
2021-07-19 14:35:44 -07:00 |
|
Andrey Lihatskiy
|
3a476a8296
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-07-19 22:22:42 +03:00 |
|
Andrey Lihatskiy
|
9873e7bba9
|
Merge branch 'master' into DRTVWR-527-maint
|
2021-07-19 22:22:32 +03:00 |
|
Andrey Lihatskiy
|
2ded530f93
|
Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
|
2021-07-19 22:20:45 +03:00 |
|
Andrey Lihatskiy
|
8b5fe507a4
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-06-25 01:02:15 +03:00 |
|
Andrey Lihatskiy
|
0ca16a1f95
|
Merge branch 'master' into DRTVWR-527-maint
# Conflicts:
# indra/newview/llinventorypanel.cpp
|
2021-06-25 01:02:04 +03:00 |