Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'FMODStudio'

Browse Source 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
This commit is contained in:
Shyotl
2015-01-26 17:15:46 -06:00
parent 2132978c41 6e4ef6f8a1
commit b865b92a6a
224 changed files with 4964 additions and 4731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
indra/newview/llstartup.cpp
View File

@@ -44,12 +44,13 @@
#include "llviewermedia_streamingaudio.h"
#include "llaudioengine.h"
#if LL_FMODEX
# include "llaudioengine_fmodex.h"
#if LL_FMODSTUDIO
# include "llaudioengine_fmodstudio.h"
#endif
#if LL_FMOD
# include "llaudioengine_fmod.h"
#if LL_FMODEX
# include "llaudioengine_fmodex.h"
#endif
#ifdef LL_OPENAL
@@ -415,6 +416,17 @@ void init_audio()
{
gAudiop = NULL;
#ifdef LL_FMODSTUDIO
if (!gAudiop
#if !LL_WINDOWS
&& NULL == getenv("LL_BAD_FMODSTUDIO_DRIVER")
#endif // !LL_WINDOWS
)
{
gAudiop = (LLAudioEngine *) new LLAudioEngine_FMODSTUDIO(gSavedSettings.getBOOL("SHEnableFMODExProfiler"), gSavedSettings.getBOOL("SHEnableFMODEXVerboseDebugging"));
}
#endif
#ifdef LL_FMODEX
if (!gAudiop
#if !LL_WINDOWS
@@ -437,17 +449,6 @@ void init_audio()
}
#endif
#ifdef LL_FMOD
if (!gAudiop
#if !LL_WINDOWS
&& NULL == getenv("LL_BAD_FMOD_DRIVER")
#endif // !LL_WINDOWS
)
{
gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();
}
#endif
if (gAudiop)
{
#if LL_WINDOWS
@@ -1614,7 +1615,7 @@ bool idle_startup()
if (gNoRender)
{
LL_WARNS("AppInit") << "Bad login - missing return values" << LL_ENDL;
LL_WARNS("AppInit") << emsg << LL_ENDL;
LL_WARNS("AppInit") << emsg.str() << LL_ENDL;
exit(0);
}
// Bounce back to the login screen.
@@ -1630,7 +1631,7 @@ bool idle_startup()
if (gNoRender)
{
LL_WARNS("AppInit") << "Failed to login!" << LL_ENDL;
LL_WARNS("AppInit") << emsg << LL_ENDL;
LL_WARNS("AppInit") << emsg.str() << LL_ENDL;
exit(0);
}
// Bounce back to the login screen.