livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,332 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

1350 Commits (e1fc7679f251a5cead135cbe78fcdfdfc749a3e2)

Author SHA1 Message Date
Andrey Lihatskiy e1fc7679f2 DRTVWR-594 Update contributions.txt 2023-11-09 23:21:18 +02: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
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
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
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 7ebf98713c SL-19681 Updated list of contributors 2023-05-03 19:53:38 +03: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
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
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
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
Andrey Lihatskiy b2e3a07ab4 SL-18988 Updated contributions.txt 2023-02-01 16:38:47 +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