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

546 Commits (b157ab47c00f9f5bc3bd2533f32cd12a4a7c2efd)

Author SHA1 Message Date
Ansariel b157ab47c0 Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagentui.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/llfloateravatarrendersettings.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/de/floater_tools.xml
#	indra/newview/skins/default/xui/en/floater_display_name.xml
#	indra/newview/skins/default/xui/en/floater_tools.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/ru/floater_tools.xml
 2023-01-12 16:56:08 +01:00
Andrey Lihatskiy f9866a3543 Merge branch 'main' into DRTVWR-573-maint-R 
# Conflicts:
#	autobuild.xml
#	indra/newview/llagent.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmediasettingsgeneral.cpp
#	indra/newview/pipeline.cpp
 2023-01-12 04:37:42 +02:00
Mnikolenko Productengine 10fcee5be6 SL-18492 Switch inventory script compiler default from LSO to mono 2022-11-03 20:03:55 +02:00
Mnikolenko Productengine 27f7edeedb SL-16534 The link item is not updating after rezzing the linked object in-world 2022-10-28 19:55:40 +03:00
Ansariel e4816961a4 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-10-22 16:53:15 +02:00
Ansariel 1ca8584322 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-22 15:48:47 +02:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Andrey Kleshchev b2ad2f0645 SL-18297 A freeze while checking marketplace for errors 2022-10-06 22:42:49 +03:00
Ansariel 2507bc6137 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 20:37:16 +02:00
Ansariel 656dd12dfc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llmodelpreview.h
 2022-09-15 20:35:44 +02:00
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N 
# Conflicts:
#	indra/newview/llmodelpreview.h
 2022-09-15 20:44:04 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Ansariel c6fb722792 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-08-31 17:57:06 +02:00
Andrey Kleshchev 5759be7cdf SL-17834 MP window freezes when loading items from Inventory 
1. Do not process all marketpalce changes at once, schedule them for later
2. Do not notifyObservers from notifyObservers
 2022-08-17 20:32:12 +03:00
Ansariel 6259666be0 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llmath/lloctree.h
#	indra/llmath/llvolume.cpp
#	indra/llrender/llgl.cpp
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/installers/windows/lang_da.nsi
#	indra/newview/installers/windows/lang_de.nsi
#	indra/newview/installers/windows/lang_en-us.nsi
#	indra/newview/installers/windows/lang_es.nsi
#	indra/newview/installers/windows/lang_fr.nsi
#	indra/newview/installers/windows/lang_it.nsi
#	indra/newview/installers/windows/lang_ja.nsi
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/installers/windows/lang_pt-br.nsi
#	indra/newview/installers/windows/lang_ru.nsi
#	indra/newview/installers/windows/lang_tr.nsi
#	indra/newview/installers/windows/lang_zh.nsi
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llvovolume.cpp
 2022-06-22 21:11:47 +02:00
Maxim Nikolenko 076a895062 SL-17635 remove unused variables 2022-06-21 17:55:29 +03:00
Ansariel 7d7aff4377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llinventorymodel.h
 2022-05-28 23:00:17 +02:00
Beq 69ad8212f3 [OPENSIM] Make sure the correct UUID is used for library 2022-05-25 17:15:03 +01:00
Beq 883890e3fb [FIRE-31674] [OPENSIM] Skip validatiion of suitcase and its contents 2022-05-25 00:17:30 +01:00
Beq f0f8ca75c2 Just ignore the suitcase as we can never be sure if it is expected. 2022-05-22 23:52:26 +01:00
Ansariel 42c1ad0439 Don't include OpenSim "Suitcase" inventory folder in validation when connecting to SL 2022-05-21 17:04:18 +02:00
Ansariel 90ec5092b8 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-19 20:41:05 +02:00
Ansariel 6e92093ee4 Fix localization issues and add German translation 2022-05-16 19:01:55 +02:00
Ansariel 309b1d2f16 We already know we're in OpenSim 2022-05-16 18:49:10 +02:00
Beq 9e99297898 Corrrrrrect spelling errrrrrror 2022-05-16 17:14:05 +01:00
Beq 30137a2ce8 FIRE-31634 [OPENSIM] Better inventory validation reporting 
Make the inventory reporting more user friendly
Make the options for fixing clearer
Make the nagging notification optional.
 2022-05-16 14:12:28 +01:00
Ansariel b8ee2c395e Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-05-12 22:39:39 +02:00
Andrey Lihatskiy 915de3eb55 Merge remote-tracking branch 'origin/SL-17243' into DRTVWR-544-maint 2022-05-12 16:06:37 +03:00
Brad Payne (Vir Linden) 57ae9c4dc4 SL-17243 - moved inventory warnings to a map 2022-05-12 13:39:01 +01:00
Brad Payne (Vir Linden) 3915c8417d SL-17243 - ViewerStats includes details on warning conditions in inventory, if any are encountered. 2022-05-11 21:19:55 +01:00
Ansariel 2daf0cb2fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
 2022-04-19 14:24:09 +02:00
Ansariel ad0aa3422f Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-04-19 00:23:41 +02:00
Andrey Lihatskiy 026ad511ea Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
 2022-04-18 20:43:49 +03:00
Andrey Kleshchev 6ab212c96b SL-16984 Dupplicated FT_SETTINGS shouldn't prevent inventory from loading 2022-03-18 14:14:38 +02:00
Andrey Kleshchev b7c58427bf SL-16984 Loop tracking and logging 2022-03-10 19:56:28 +02:00
Andrey Kleshchev 4a4c138891 SL-16984 Fixed inventory loop freezing viewer 2022-03-08 00:51:43 +02:00
Ansariel a74de2d794 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +01:00
Ansariel 25f974d77d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 10:00:36 +01:00
Andrey Lihatskiy 1e0eafd50c Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/llviewerregion.cpp
 2022-02-28 21:56:25 +02:00
Andrey Lihatskiy 73eec89131 Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llfloatereditextdaycycle.cpp
 2022-02-28 21:54:21 +02:00
Ansariel 828fbdc571 Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer 2022-02-02 10:37:33 +01:00
Brad Payne (Vir Linden) 1049089dd1 SL-16715 - viewerstats, added more detail about failure cases in inventory 2022-01-28 17:51:29 +00:00
Ansariel 6638d1d367 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-26 12:31:20 +01:00
Andrey Kleshchev 5ab34ccc5a SL-1159 Fix inbox consolidation failure 2022-01-21 19:58:38 +02:00
Ansariel 2ba4a164e2 Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Python.cmake
#	indra/lib/python/indra/util/llmanifest.py
#	indra/lib/python/indra/util/test_win32_manifest.py
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcommon/llerror.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/lleventnotifier.cpp
#	indra/newview/llpanellandmarks.cpp
#	indra/newview/llpreviewanim.cpp
#	indra/newview/llpreviewanim.h
#	indra/newview/llviewerregion.cpp
#	indra/newview/skins/default/xui/de/menu_place_add_button.xml
#	indra/newview/skins/default/xui/it/menu_place_add_button.xml
#	indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
#	indra/newview/skins/default/xui/ja/menu_place_add_button.xml
#	indra/newview/skins/default/xui/pl/menu_place_add_button.xml
#	indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
#	indra/newview/skins/default/xui/ru/menu_place_add_button.xml
#	indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
#	indra/newview/viewer_manifest.py
 2021-12-16 12:32:34 +01:00
Andrey Kleshchev ac54b72974 SL-16497 Fix inventory update recursion 2021-12-13 19:42:20 +02:00
Ansariel 1d9d378a9b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-19 09:08:43 +01:00
Andrey Lihatskiy 49dd88e86c Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llviewerinput.cpp
 2021-11-19 04:45:15 +02:00
Ansariel bb3885fc45 Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-11-16 15:49:39 +01:00
Ansariel f00647b6fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 15:38:25 +01:00