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
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
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
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
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
Callum Prentice
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
Ansariel
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
andreykproductengine
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
Ansariel
1f02cfc1de
Merge viewer-neko
2018-08-16 14:51:06 +02:00
andreykproductengine
ac5a547019
MAINT-8958 Handle initDecode crash
2018-08-07 16:10:46 +03:00
Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Nicky
566db89385
FIRE-15975; Do not leave stale locks if flushing a bad file.
2015-06-07 20:52:38 +02:00
Nicky
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
Ansariel
f14da991e1
FIRE-480: Opening multiple instances causes sound failures; Based on a patch by Jules Joffe contributed to https://jira.secondlife.com/browse/VWR-10592 but heavily modified to make it really work
2015-04-11 11:18:01 +02:00
callum_linden
f708104e37
Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable]
2014-10-17 15:14:21 -07:00
callum_linden
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
simon
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
maksymsproductengine
36c8c92098
MAINT-3804 FIXED Crash in LLAudioEngine::getAudioData when playing gestures with audio device disabled.
2014-03-14 06:39:09 +02:00
Tank_Master
dc353c205a
Merge
2014-06-10 20:27:31 -07:00
Tank_Master
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
Ansariel
70218d0ac2
FIRE-13385: Added option to separate cached sounds from default cache; Originally implemented by Skills Hak with permission to use under LGPL, rewritten for Firestorm
2014-04-05 15:23:15 +02:00
Richard Linden
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
Tank_Master
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
Oz Linden
e10c32b30a
clean up audio engine logging
2013-12-19 12:10:26 -05:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Tank_Master
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
Richard Linden
cda2cdda51
SH-3406 WIP convert fast timers to lltrace system
...
made fast timer stack thread local
added LLThreadLocalSingleton
made LLThreadLocalPointer obey pointer rules for const
added LLThreadLocalSingletonPointer for fast thread local pointers
2013-01-03 00:30:54 -08:00
Nicky
85d8875572
Prevent log spam.
2013-03-13 02:11:57 +01:00
simon@Simon-PC.lindenlab.com
39b7671d05
MAINT-862 and ER-1781 : Sounds not playing the first time. Reviewed by Kelly.
2012-05-16 17:09:07 -07:00
simon@Simon-PC.lindenlab.com
78afd7297b
MAINT-862 and ER-1781 : Sounds not playing the first time. Reviewed by Kelly.
2012-05-16 17:09:07 -07:00
Nicky
47fe3acebb
Backout fd2494436720 to make room for fix from LL.
2012-06-09 18:02:19 +02:00
Tank_Master
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
Liny
8c6fafb49d
Changing some debug lines into the ONCE versions to prevent log spamming and reduced performance.
2012-03-28 17:07:02 -07:00
Nicky
c0bbc101d7
FIRE-5503; Fix for sounds not playing right away.
2012-03-29 00:46:33 +02:00
Richard Linden
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
Andrew de Laix
ec0c28ad83
update ogg-vorbis archive for linux.
2011-03-14 20:24:55 +00:00
Andrew A. de Laix
12c2fd2ef0
update ogg-vorbis archive usage for darwin.
2011-03-07 14:23:09 -08:00
Tofu Linden
f7d51863f9
slightly lame robustification for:
...
CID-507
Checker: REVERSE_INULL
Function: LLVorbisDecodeState::initDecode()
File: /indra/llaudio/llaudiodecodemgr.cpp
2010-09-09 12:38:03 +01:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Tofu Linden
90a73085fd
EXT-8597 FIXED [crashhunters] LLVorbisDecodeState::initDecode()
...
not for certain fixed, but some robustification.
2010-08-09 16:14:12 +01:00