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
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
478c1e47be
SL-16902 Fmod better logging
2022-04-04 22:46:50 +03:00
625cc84ec0
SL-16865 llStopSound() does not stop sound if it is out of cutoff radius
2022-03-21 09:44:55 +02:00
be820f2eb9
Revert "Debug Fmod with logging"
...
This reverts commits b21c17eee92f78338aeb
2022-03-14 18:38:44 +02:00
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
2f78338aeb
Debug Fmod with logging
2022-02-23 10:45:25 +02:00
d91606b354
Merge branch 'master' into DRTVWR-544-maint
2021-12-20 15:36:23 +02:00
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
59ceaf5569
SL-16339 Rename setAmbient in openal
2021-11-27 18:28:23 +02:00
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
e729910e1b
SL-14992 fmod shutdown crash
2021-11-18 20:37:26 +02:00
ac2135a459
SL-16235 Restart music in case of an error
...
Additional logging
2021-11-18 20:35:50 +02:00
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
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
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
38faec3b11
Merge branch 'master' into DRTVWR-519
2020-09-22 13:07:39 -07:00
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
2e6f516411
Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16 21:12:53 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-09-16 18:53:24 -07:00
846d0d3371
SL-13390 Fix Openal Builds
2020-06-05 17:25:51 +03:00
363e9c949b
Merge branch 'master' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2020-06-02 23:15:38 +03:00
13f501b333
Merged master into DRTVWR-508
2020-05-04 19:34:48 +03:00
032c4a1b49
SL-12607 WIP, take pre-sized icons from repo instead of package
2020-04-14 21:32:10 +03:00
2542a3ed79
SL-11445 Provide 'name' for Pulse Audio
2020-04-10 17:00:22 +03:00
1598a368cd
SL-11445 On exit LLWindGen can be invalid
2020-04-09 16:57:19 +03:00
c0ce256591
SL-11445 Fix fmod studio position and orientation attributes
2020-04-09 16:04:37 +03:00
8cb9bcf1d6
SL-11445 Fix fmod studio opening audio files
2020-04-09 13:12:30 +03:00
f5ec281b1b
SL-11445 Fix crash caused by wind cleanup
2020-03-19 15:47:49 +02:00
b99fcdb30a
SL-12707 Build Fails Without FMOD
...
Also adds correct working directory to RelWithDebInfoOS and enables OpenAl on OS builds for windows
2020-02-14 13:34:07 +02:00
9a6dcc011c
SL-11455 Added linux pulseaudio and alsa support
2020-02-05 00:58:37 +02:00
6627d684a2
SL-12654 Remove support for building with fmod ex
2020-02-04 17:12:19 +02:00
e76f25d25f
SL-11445 Couple small fixes
2020-02-04 16:19:20 +02:00
192aee0f19
Merged in SL-11445 Upgrade Fmodex to Fmod Studio
2020-01-31 15:05:51 +00:00
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
09dc92b264
SL-10334 Increased allowed sound clip length from 10s to 30s
2019-05-02 02:04:07 +03:00
ac5a547019
MAINT-8958 Handle initDecode crash
2018-08-07 16:10:46 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
9960145ed0
remove redundant include of Audio.cmake
2014-12-15 12:52:26 -05:00
f708104e37
Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable]
2014-10-17 15:14:21 -07:00
76a35059f2
Update to build on Xcode 6.0: clang detecting unsigned int (size_t) comparison with <0 [-Wtautological-compare]
2014-10-17 15:11:10 -07:00
5519e8eac2
merge changes for OPEN-213
2014-08-18 11:58:04 -04:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
71c4655235
Fix broken header guard
2014-04-09 22:11:59 +00:00
e5bbdafded
merge with release
2014-03-24 19:23:34 -07:00
5c20e06dbd
Pull in viewer-release and become version 3.7.5
2014-03-26 10:02:25 -07:00
c62d2cca29
Additions & fixes for lib copy, use only forwarded ptrs in LLAE interfaces.
...
Copy3rdPartyLibs needed to copy the now-corrected fmodexL libraries
and it had a bad library reference on Linux for release. In
llaudio land, the audio engine interfaces, even the fmodex
specializations, seem to want to be external-structure free
so use a forward declaration and pointer to FMOD_DSP_DESCRIPTION
and deal with it in the ctor/dtor.
2014-03-14 20:58:35 -04:00
4f565ed077
Update fmodex to 4.44.31. Move DSP descriptor to heap storage.
2014-03-14 19:48:35 -04:00
36c8c92098
MAINT-3804 FIXED Crash in LLAudioEngine::getAudioData when playing gestures with audio device disabled.
2014-03-14 06:39:09 +02:00
Andrey Kleshchev