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

277 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
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
Ansariel 49b6f9b312 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 14:52:20 +02:00
Ansariel 6d09c9ff89 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 12:37:05 +02:00
Nicky 2b6427e1ba Remove some old code. 2022-08-03 10:49:53 +02:00
Ansariel f9f81ebe20 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-07-22 12:19:11 +02:00
Andrey Kleshchev 3f89c98dac SL-17816 Crash trying to schedule audio decoding on shutdown 2022-07-22 03:11:19 +03:00
Ansariel 9300613edc Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-06-29 21:57:31 +02:00
Ansariel cfb6c083fe Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/llfilesystem/lldiskcache.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
 2022-06-24 22:18:44 +02:00
Cosmic Linden 6e686f1ef6 SL-17021: Fix inconsistent header definition for LLAudioEngine_OpenAL 2022-06-22 14:50:28 -07:00
Ansariel 7185e97905 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llaudio/llaudiodecodemgr.cpp
#	indra/llaudio/llaudioengine.cpp
#	indra/llaudio/llaudioengine.h
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llrender/llrender.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llviewerwindow.cpp
#	indra/newview/pipeline.cpp
 2022-06-15 10:38:52 +02:00
Cosmic Linden 462b1c6544 SL-16182: Fix Mac compiler errors 2022-06-14 13:00:53 -07:00
Cosmic Linden 30252bceb0 SL-16182: LLAudioDecodeMgr: Get general worker thread count directly from ThreadPool 2022-06-14 11:31:52 -07:00
Cosmic Linden 3e60b53d52 SL-16182: Offload audio decoding from the main thread to the general work queue. 
The work queue callback binds "this". This is deemed safe due to current dependencies, but see the associated comment in the return callback. There was some trial and error to get a this-binded lambda to compile.

Due to LLVorbisDecodeState writing to disk off-thread, limit audio decodes proportional to general worker thread count. Guess the thread count for now.
 2022-06-14 11:31:52 -07:00
Andrey Kleshchev d1265cda36 SL-17425 Crash when closing two dependent floaters 
dependent_it in llfloater was not valid after dependent floater removed itself from the list
 2022-05-20 01:35:40 +03:00
Ansariel a4d60d06ec Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-05 10:43:31 +02:00
Nicky e5f684f085 Make SDL2 a cmake option, use SDL2 Mixer for audio playback, this might open a good way to a full open source way (no FModStudio needed). But here be dragons still. 2022-04-25 21:24:29 +02:00
Ansariel ac2ee57edb Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/lllocationinputctrl.h
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/viewer_manifest.py
#	indra/viewer_components/login/lllogin.cpp
 2022-04-19 15:27:35 +02: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 478c1e47be SL-16902 Fmod better logging 2022-04-04 22:46:50 +03:00
Andrey Kleshchev 625cc84ec0 SL-16865 llStopSound() does not stop sound if it is out of cutoff radius 2022-03-21 09:44:55 +02:00
Andrey Kleshchev be820f2eb9 Revert "Debug Fmod with logging" 
This reverts commits b21c17eee9 and 2f78338aeb.
'Debug Fmod' was not an intended commit, was meant for local testing. But might be a good idea to make this a part of DebWithRelInfo or provide a cmake switch.
 2022-03-14 18:38:44 +02:00
Ansariel 63238d1fbe Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/viewer_manifest.py
 2022-03-01 19:19:48 +01:00
Ansariel a74de2d794 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +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 Kleshchev 2f78338aeb Debug Fmod with logging 2022-02-23 10:45:25 +02:00
Nicky e3a9c5ef3b Mark third party include directory as system (-isystem) so GCC stops complaining about warnings in those headers. 2022-02-10 21:48:48 +01:00
Ansariel f46a15b3f3 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-11 15:04:11 +01:00
Mnikolenko Productengine d91606b354 Merge branch 'master' into DRTVWR-544-maint 2021-12-20 15:36:23 +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 59ceaf5569 SL-16339 Rename setAmbient in openal 2021-11-27 18:28:23 +02:00
Andrey Kleshchev 993ac3b95c SL-16339 Rename setAmbient to not cause confusion 
setAmbient has nothing to do with ambient sounds
 2021-11-26 23:52:33 +02:00
Andrey Kleshchev e729910e1b SL-14992 fmod shutdown crash 2021-11-18 20:37:26 +02:00
Andrey Kleshchev ac2135a459 SL-16235 Restart music in case of an error 
Additional logging
 2021-11-18 20:35:50 +02:00
Ansariel 0fca12bdc9 Try to restart audio streams in case of network errors 2021-11-09 22:18:57 +01:00
Ansariel bb8b2db7fc More FMOD stream playback output 2021-05-10 20:56:22 +02:00
Ansariel cf5d74e24f Verbose stream playback error logging 2021-05-10 19:20:45 +02:00
Andrey Kleshchev bf78fdf362 SL-14992 Replaced LLAPRFile's isExist with LLDirUtil's fileExists in fmodstudio 
This particular case of LLAPRFile crashes due to thread issues (and if it doesn't it might be affecting some other apr call due to using default pool).
Function is not opening the .dsf file in question and LLAPRFile won't ensure that file exists till the end of the function, it just checks that file exists at a given moment. No point to overcomplicate things by adding thread safe pool, so replaced with dirutil.
 2021-03-26 22:52:09 +01:00
Andrey Kleshchev d38c2d8cd8 SL-14992 Replaced LLAPRFile's isExist with LLDirUtil's fileExists in fmodstudio 
This particular case of LLAPRFile crashes due to thread issues (and if it doesn't it might be affecting some other apr call due to using default pool).
Function is not opening the .dsf file in question and LLAPRFile won't ensure that file exists till the end of the function, it just checks that file exists at a given moment. No point to overcomplicate things by adding thread safe pool, so replaced with dirutil.
 2021-03-25 20:14:04 +02:00
Ansariel e6c34f01d2 Revert revert of Simplified Cache viewer release - continue with simplified cache 
This reverts commit 40ad606ae0, reversing
changes made to 906cfe699d.
 2021-03-10 15:13:12 +01:00
Ansariel 40ad606ae0 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer (Revert of Simplified Cache viewer release) 2021-03-10 15:10:41 +01:00
Callum Prentice 168d177197 This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal 2021-03-09 14:39:51 -08:00
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
 2021-03-08 13:56:16 +00:00
Ansariel 6b6b116fd4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-03-03 00:20:02 +01:00
Ansariel 3e30c2d28f Return value can only be false here - make it obvious 2020-12-10 09:27:47 +01:00
Ansariel 41c8f09e06 FIRE-17879: Fix possible crash in sound explorer: Stored audio source pointer might be invalid 2020-11-11 12:04:56 +01:00
Callum Prentice 6be1f88a5e Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation 2020-09-24 14:45:39 -07:00
Callum Prentice 38faec3b11 Merge branch 'master' into DRTVWR-519 2020-09-22 13:07:39 -07:00
Callum Prentice d9448c6f52 The folder where the disk cache lives was originally renamed from llvfs to llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over 2020-09-17 09:45:06 -07:00