Aleric Inglewood fbb5dced97 Merge remote-tracking branch 'singu/master' into curlthreading2 ...

Conflicts:
	indra/llcommon/CMakeLists.txt
	indra/llmessage/llcurl.cpp
	indra/llmessage/llcurl.h
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llpumpio.cpp
	indra/llmessage/llpumpio.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp
	indra/newview/llspatialpartition.cpp
	indra/newview/llviewermedia.cpp
	indra/newview/llxmlrpctransaction.cpp

Conflicts resolved by choosing curlthreading2
for any llmessage file regardless (which looks
correct upon investigation); the rest also
turned out to need to use curlthreading2, except
in one line where I added a semi-colon after
an assert(), and the assert was changed in
singu/master.

2012-08-13 17:07:25 +02:00

..

CMakeLists.txt

First set of changes for new librarys and lib layout support!

2012-07-04 00:26:42 +00:00

llaudiodecodemgr.cpp

Fix LL_REF_COUNT_DEBUG debug code.

2012-08-09 07:00:51 +02:00

llaudiodecodemgr.h

Imported existing code

2010-04-02 02:48:44 -03:00

llaudioengine_fmod.cpp

Added AllowLargeSounds setting to disable v2 sound-decode strictness

2011-06-09 16:53:46 -05:00

llaudioengine_fmod.h

Imported existing code

2010-04-02 02:48:44 -03:00

llaudioengine_fmodex.cpp

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

2012-08-09 00:42:23 +02:00

llaudioengine_fmodex.h

Changing the rolloff settings now immediately apply (with fmodex). Also added AudioLevelUnderwaterRolloff now that the underwater rolloff 3d setting doesnt immediately get clobbered. Also, divvied up sound channels into channelgroups if using the fmod profiler, so it actually has useful info to show now.

2012-07-20 04:00:02 -05:00

llaudioengine_openal.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llaudioengine_openal.h

Imported existing code

2010-04-02 02:48:44 -03:00

llaudioengine.cpp

Cherry-pick of 24a7281bef42 from viewer-development, also added missing AttachmentDrop to notifications.xml

2012-06-02 05:13:50 -04:00

llaudioengine.h

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2012-07-23 03:04:33 +02:00

lllistener_ds3d.h

Imported existing code

2010-04-02 02:48:44 -03:00

lllistener_fmod.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

lllistener_fmod.h

Imported existing code

2010-04-02 02:48:44 -03:00

lllistener_fmodex.cpp

Changing the rolloff settings now immediately apply (with fmodex). Also added AudioLevelUnderwaterRolloff now that the underwater rolloff 3d setting doesnt immediately get clobbered. Also, divvied up sound channels into channelgroups if using the fmod profiler, so it actually has useful info to show now.

2012-07-20 04:00:02 -05:00

lllistener_fmodex.h

A stab at fmodex support on windows. To use, install 'FMOD Ex Programmers API' to its defualt program files directory, and run develop.py with -DFMODEX:BOOL=ON set. That /should/ be all it takes.

2011-12-22 18:01:07 -06:00

lllistener_openal.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

lllistener_openal.h

Imported existing code

2010-04-02 02:48:44 -03:00

lllistener.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

lllistener.h

Imported existing code

2010-04-02 02:48:44 -03:00

llstreamingaudio_fmod.cpp

Fmod metadata parsing. Innitial.

2011-12-21 01:23:04 -06:00

llstreamingaudio_fmod.h

Semicolon care and feeding

2012-01-07 23:44:46 +01:00

llstreamingaudio_fmodex.cpp

Autodetect music stream type properly

2012-08-09 05:09:02 +02:00

llstreamingaudio_fmodex.h

Don't ever halt stalled fmodex streams, as they don't seem to truly 'stall'. Decrease delay between leaving starvation and unmuting down to 1 second (from 5).

2012-07-19 02:32:16 -05:00

llstreamingaudio.h

FMODEx diagnostics.

2012-07-18 21:05:24 -05:00

llvorbisdecode.cpp

Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights

2012-01-09 05:40:03 -05:00

llvorbisdecode.h

Imported existing code

2010-04-02 02:48:44 -03:00

llvorbisencode.cpp

Fixed FMOD Ex support under linux

2012-05-15 10:36:48 -04:00

llvorbisencode.h

V2 llaudio merge

2011-02-21 02:02:24 -06:00

llwindgen.h

A stab at fmodex support on windows. To use, install 'FMOD Ex Programmers API' to its defualt program files directory, and run develop.py with -DFMODEX:BOOL=ON set. That /should/ be all it takes.

2011-12-22 18:01:07 -06:00