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

655 Commits (77b6a6e97831399a359bcf8d6195a63c9a2283c8)

Author SHA1 Message Date
Ansariel 77b6a6e978 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-03-27 15:32:45 +01:00
Ansariel 1f75fbd3b5 Merge branch 'main' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llimage/llimagebmp.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llrender/llrender.cpp
#	indra/llui/lltransutil.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerwindow.cpp
 2024-03-26 22:43:42 +01:00
Andrey Kleshchev 78ce375dda SL-17896 Don't crash silently if files are missing or out of memory 
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
 2024-03-05 00:29:35 +02:00
Ansariel 45dc1a63f0 Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llprimitive/lldaeloader.cpp
#	indra/llui/lllayoutstack.cpp
#	indra/llui/llnotifications.h
#	indra/llui/lltoolbar.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterimcontainer.cpp
#	indra/newview/llfloaterimnearbychathandler.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llsidepanelappearance.h
#	indra/newview/lltoolbarview.cpp
 2024-01-12 14:18:34 +01:00
AiraYumi 7c8907522f replace boost library to standard 2024-01-08 23:29:21 +02:00
Ansariel 4b923d4291 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerregion.h
 2023-08-24 20:48:55 +02:00
Brad Linden c6d5f11f63 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-08-23 12:26:14 -07:00
Ansariel 682535dd16 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/cmake/00-Common.cmake
#	indra/llcommon/stdtypes.h
 2023-07-19 10:27:16 +02:00
Brad Linden ca008cfc31
Merge pull request #292 from secondlife/brad/DRTVWR-559-xcode-14.3 
Merge xcode-14.3 compatibility branch into DRTVWR-559
 2023-07-18 16:48:33 -07:00
Brad Linden ae63ed51aa Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292) 2023-07-18 14:38:18 -07:00
Andrey Kleshchev ca247e9a80 SL-5161 SL-20025 Unref volume 2023-07-18 22:04:32 +03:00
Ansariel 133f8108b1 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-12 09:26:38 +02:00
Cosmic Linden 59a626c2a2 SL-19992: Fix assert in LLVolumeLODGroup::refLOD when LLMeshRepository::notifyMeshUnavailable is called on the highest LOD 2023-07-11 16:28:36 -07:00
Ansariel fe243a3042 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llworld.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-06-27 13:14:11 +02:00
Andrey Kleshchev ca84e0e0c0 SL-5161 Avatars should stay hidden longer if they are waiting for meshes or skin data 2023-06-23 13:01:19 +03:00
Andrey Kleshchev 4e6303792a SL-5161 Don't render meshes that are waiting for skin data 2023-06-22 22:32:42 +03:00
Nat Goodspeed b11b53b72c SL-18330: Change to strip_deprecated_header(size_t* header_size) 
from U32*.
 2023-05-31 16:33:01 -04:00
Ansariel 75b2ac651a Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 2023-05-31 10:36:37 +02:00
Andrey Lihatskiy 3b13c0ca15 DRTVWR-582 xcode-14.3 merge follow up 2023-05-26 21:01:15 +03:00
Andrey Lihatskiy b9cd6e2e84 Merge branch 'xcode-14.3' into DRTVWR-582-maint-U 
# Conflicts:
#	indra/llcommon/llsdserialize.h
 2023-05-26 06:15:49 +03:00
Ansariel 21a8eddf25 Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/installers/windows/lang_zh.nsi
#	indra/newview/llviewermessage.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llwearableitemslist.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-05-18 15:14:26 +02:00
simon 90631fccef SL-19676 - more update and scene loading stats. Added texture and mesh 
count
 2023-05-09 17:16:26 +01:00
Ansariel 9057bfc995 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llcallstack.h
#	indra/llinventory/llsettingssky.cpp
#	indra/llmath/llvolume.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llviewerstats.cpp
#	indra/newview/llvoavatar.cpp
 2023-05-05 12:35:33 +02:00
RunitaiLinden 1cadfd44fe DRTVWR-559 WIP - optimize ARC calculation et al. 2023-05-03 17:30:02 -05:00
Nat Goodspeed 22a07b1121 SL-18330: fix strip_deprecated_header(cur_size) param to llssize. 2023-05-03 12:48:22 -04:00
Ansariel b318e24f25 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llglslshader.cpp
#	indra/newview/lldrawable.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
 2023-05-03 14:59:31 +02:00
RunitaiLinden e09475713b DRTVWR-559 Optimization pass, make it so profileAvatar can read back GPU timer without a frame stall. 2023-05-02 18:47:21 -05:00
Ansariel 9b93864eb9 Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/tests/llleap_test.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llurldispatcher.cpp
#	indra/newview/llvieweraudio.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/skins/default/xui/en/strings.xml
 2023-04-21 14:22:42 +02:00
Ansariel 7731ee8d50 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llmeshrepository.cpp
 2023-02-28 12:44:49 +01:00
Ansariel 73e5615d43 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llimagej2coj/llimagej2coj.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
#	indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
#	indra/newview/llsettingsvo.cpp
 2023-02-03 11:11:13 +01:00
Brad Linden 5fabfa50d7 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-02-02 12:11:40 -08:00
Ansariel 6bab49e7d9 Fix build 2023-01-25 14:24:28 +01:00
Ansariel a1090f5f5d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/quickprefs.cpp
 2022-10-24 19:54:30 +02:00
Andrey Kleshchev 24fb2f8336 Merge branch 'master' (DRTVWR-548) into DRTVWR-559 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
 2022-10-21 18:19:27 +03:00
Ansariel 2aceea66ff Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmath/llvolume.h
#	indra/newview/llfloateropenobject.cpp
#	indra/newview/llfloateropenobject.h
#	indra/newview/llmaterialmgr.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/skins/default/xui/en/floater_openobject.xml
 2022-10-01 13:10:39 +02:00
Rye Mutt d1701fb5b1 Fix small bug in unavail skin info processing 2022-09-28 09:55:57 -04:00
Rye Mutt 9f633e087f Optimize away many string copies in mesh header processing with boost iostream array adapters 2022-09-27 17:59:21 -04:00
Rye Mutt 07449892df Optimize mesh queue processing on main thread to reduce mutex contention 2022-09-27 17:59:21 -04:00
Rye Mutt 9ec86c84e3 Add proper retry support to skin info fetch 2022-09-27 17:59:21 -04:00
Rye Mutt bd20b61b82 Optimize away gObjectList finds during mesh load 2022-09-27 17:59:21 -04:00
Rye Mutt e83146ce0c Optimize away constant map finds in getSkinInfo by caching mesh skin into in vovolume 2022-09-27 17:59:21 -04:00
Rye Mutt 7dcdc4c378 Replaced usage of LLVolumeParams as map key in meshrepo with the mesh uuid 2022-09-27 17:59:21 -04:00
Rye Mutt e097794919 Optimize mesh header size and data access throughout meshrepo 2022-09-27 17:59:21 -04:00
Rye Mutt 4be11d87b5 Utilize pointer based unzip_llsd and unpackVolumeFaces in meshrepo and materialmgr 2022-09-27 17:59:21 -04:00
Andrey Kleshchev 7649114588 Merge branch master (DRTVWR-571) into DRTVWR-559 
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
 2022-09-16 21:07:39 +03:00
Ansariel 5a78473123 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2022-09-16 11:23:28 +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
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