Ansariel
|
523662a5c8
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2023-05-02 18:22:32 +02:00 |
|
Ansariel
|
c7fe346ff0
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llrender/llimagegl.cpp
|
2023-03-30 13:06:36 +02:00 |
|
Ansariel
|
2c51fe5aad
|
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llvovolume.cpp
|
2023-03-22 17:35:43 +01:00 |
|
Ansariel
|
40b731eb76
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
# Conflicts:
# .gitignore
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
|
2023-03-21 10:57:56 +01:00 |
|
Ansariel
|
adde408b18
|
Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llfloaterpreference.h
# indra/newview/llstartup.cpp
# indra/newview/llvovolume.cpp
|
2023-03-07 14:57:47 +01: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 |
|
Ansariel
|
06ac6c615c
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# .gitignore
# doc/contributions.txt
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llviewercontrol.cpp
# indra/newview/viewer_manifest.py
|
2023-02-03 15:34:47 +01: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 |
|
Ansariel
|
68c04f41ad
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/newview/viewer_manifest.py
|
2022-12-19 22:59:03 +01:00 |
|
Ansariel
|
15f55c0a88
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
|
2022-12-13 18:03:50 +01: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 |
|
Ansariel
|
5f81627faf
|
Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloateravatar.h
|
2022-12-12 22:11:54 +01:00 |
|
Ansariel
|
67081f9728
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloater360capture.cpp
|
2022-12-12 22:09:54 +01: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 |
|
Ansariel
|
4e87c96292
|
Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/newview/llfloater360capture.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llvoavatar.cpp
# indra/newview/pipeline.cpp
|
2022-11-23 10:08:56 +01:00 |
|
Ansariel
|
ddfd54650e
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
|
2022-11-23 10:02:57 +01:00 |
|
Ansariel
|
57e8cd490f
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-11-23 10:00:44 +01:00 |
|
Ansariel
|
1bb61071a1
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-11-23 09:58:43 +01: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 |
|
Ansariel
|
8f45ad9323
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-11-22 16:29:17 +01:00 |
|
Ansariel
|
abbfb9b7d0
|
Merge branch 'DRTVWR-565-maint-P' of https://github.com/secondlife/viewer
|
2022-11-22 16:23:13 +01:00 |
|
Andrey Lihatskiy
|
25c62f554f
|
Merge branch 'master' into DRTVWR-570-maint-Q
|
2022-11-21 22:46:35 +02:00 |
|
Ansariel
|
dbc70be7c4
|
Merge branch 'master' of https://github.com/secondlife/viewer
# Conflicts:
# README.md
# autobuild.xml
|
2022-11-21 20:37:32 +01: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 |
|
Ansariel
|
cb10f3b149
|
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# doc/contributions.txt
# indra/llcommon/threadsafeschedule.h
# indra/llwindow/llwindowmacosx-objc.mm
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappdelegate-objc.mm
# indra/newview/llfilepicker_mac.mm
# indra/newview/llsettingsvo.cpp
# indra/newview/llvosky.cpp
|
2022-11-11 12:15:54 +01: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 |
|
Beq
|
dedee8ba50
|
initial merge form DRTVWR-539 branch
|
2022-11-02 22:37:24 +00:00 |
|
Ansariel
|
da8f95ad22
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-11-02 18:06:07 +01: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 |
|
Ansariel
|
7732257ea5
|
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
|
2022-11-02 13:05:00 +01: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 |
|
Ansariel
|
9ee1a75474
|
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/skins/default/xui/en/floater_settings_debug.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
|
2022-11-01 17:17:56 +01:00 |
|
Ansariel
|
1bdfb7df70
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-11-01 15:16:40 +01: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 |
|
Ansariel
|
8b2b11d4a0
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
|
2022-10-26 20:42:44 +02:00 |
|
Ansariel
|
242c8cb5ed
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/CMakeLists.txt
# indra/llprimitive/llmodel.cpp
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lllegacyatmospherics.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llworld.cpp
|
2022-10-25 11:49:36 +02: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 |