Shyotl e8ce35ebf8 Merge branch 'master' into UICleanup ...

Conflicts:
	indra/llcommon/llstl.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llfloateranimpreview.cpp
	indra/newview/llfloateranimpreview.h
	indra/newview/llfloaterperms.cpp
	indra/newview/llfloaterproperties.cpp
	indra/newview/llpanelpermissions.cpp
	indra/newview/llviewermenu.cpp

2013-05-03 21:41:51 -05:00

..

CMakeLists.txt

CMake cleanup and organization

2013-03-05 12:24:51 -05:00

llaudiodecodemgr.cpp

Fix LL_REF_COUNT_DEBUG debug code.

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

llaudiodecodemgr.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llaudioengine_fmod.cpp

Revert "Add the new audio init code (experimental)"

2013-04-23 03:15:59 +02:00

llaudioengine_fmod.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llaudioengine_fmodex.cpp

Fix audio the proper way

2013-04-23 03:16:31 +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

Import some changes from internal

2013-03-12 06:03:06 -04:00

llaudioengine_openal.h

Import some changes from internal

2013-03-12 06:03:06 -04:00

llaudioengine.cpp

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llaudioengine.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

lllistener_ds3d.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

lllistener_fmod.cpp

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

lllistener_fmod.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06: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

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

lllistener_openal.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

lllistener.cpp

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

lllistener.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llstreamingaudio_fmod.cpp

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llstreamingaudio_fmod.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llstreamingaudio_fmodex.cpp

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00

llstreamingaudio_fmodex.h

Testing: Be a bit more OCD about avoiding starting new streams before the previous one has been successfully been released.

2013-05-03 14:32:18 -05:00

llstreamingaudio.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06: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

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llvorbisencode.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -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