Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +02:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
Ansariel
|
9ea9c6bd96
|
Counter-yoink Kokua's stream title floater idea from Chorazin Allen, but dump all of it and re-implement it completely new from scratch, make it bad-ass and get rid of this ridiculous stream title polling every 2 seconds \o/
|
2022-12-04 18:27:01 +01:00 |
|
Ansariel
|
9300613edc
|
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
|
2022-06-29 21:57:31 +02: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
|
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 |
|
Andrey Kleshchev
|
478c1e47be
|
SL-16902 Fmod better logging
|
2022-04-04 22:46:50 +03: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 |
|
Ansariel
|
3e30c2d28f
|
Return value can only be false here - make it obvious
|
2020-12-10 09:27:47 +01:00 |
|
Ansariel
|
773eeb1d37
|
More upstream sync
|
2020-04-09 08:30:08 +02:00 |
|
Ansariel
|
041d5a5c0b
|
Sync FMOD Studio implementation with upstream so we can keep our version when merging with upstream
|
2020-04-09 00:43:56 +02:00 |
|
Andrey Kleshchev
|
192aee0f19
|
Merged in SL-11445 Upgrade Fmodex to Fmod Studio
|
2020-01-31 15:05:51 +00:00 |
|
Liny
|
375fe0a924
|
Fix build on osx by fixing equality typo.
|
2018-10-13 17:24:29 -07:00 |
|
Ansariel
|
872a28c506
|
FIRE-23152: Fix stream metadata display for OGG Vorbis (might be ICY streaming server specific)
|
2018-10-11 23:46:48 +02:00 |
|
Ansariel
|
5e1c9a92a8
|
Add support for FMOD Studio, originally by Drake Arconis (Alchemy Viewer), with FS-specific additions by Drakeo
|
2017-12-16 19:34:03 +01:00 |