From e76f25d25fb96965fcf37a477bbf8c14ef1eccb2 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 4 Feb 2020 16:19:20 +0200
Subject: [PATCH] SL-11445 Couple small fixes
---
.gitignore | 1 +
indra/cmake/FMODSTUDIO.cmake | 2 +-
indra/llaudio/lllistener_fmodstudio.cpp | 5 +++--
indra/llaudio/llstreamingaudio_fmodstudio.h | 2 +-
indra/newview/app_settings/settings.xml | 6 +++---
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index 27b629a578c..2d32e94c782 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
*.bak
*.diff
*.orig
+*.patch
*.pyc
*.rej
*.swp
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index 1539270d6c4..8840354ac6c 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -27,7 +27,7 @@ if (FMODSTUDIO)
debug fmodL
optimized fmod)
elseif (LINUX)
- set(FMODEX_LIBRARY
+ set(FMODSTUDIO_LIBRARY
debug fmodL
optimized fmod)
endif (WINDOWS)
diff --git a/indra/llaudio/lllistener_fmodstudio.cpp b/indra/llaudio/lllistener_fmodstudio.cpp
index fd88b981c44..34f3d00eaed 100644
--- a/indra/llaudio/lllistener_fmodstudio.cpp
+++ b/indra/llaudio/lllistener_fmodstudio.cpp
@@ -105,9 +105,10 @@ void LLListener_FMODSTUDIO::commitDeferredChanges()
void LLListener_FMODSTUDIO::setRolloffFactor(F32 factor)
{
- //An internal FMODEx optimization skips 3D updates if there have not been changes to the 3D sound environment.
+ //An internal FMOD optimization skips 3D updates if there have not been changes to the 3D sound environment.
+ // (this was true for FMODex, looks to be still true for FMOD STUDIO)
//Sadly, a change in rolloff is not accounted for, thus we must touch the listener properties as well.
- //In short: Changing the position ticks a dirtyflag inside fmodex, which makes it not skip 3D processing next update call.
+ //In short: Changing the position ticks a dirtyflag inside fmod, which makes it not skip 3D processing next update call.
if (mRolloffFactor != factor)
{
LLVector3 pos = mVelocity - LLVector3(0.f, 0.f, .1f);
diff --git a/indra/llaudio/llstreamingaudio_fmodstudio.h b/indra/llaudio/llstreamingaudio_fmodstudio.h
index 6637b2d1553..1fc3c54d79b 100644
--- a/indra/llaudio/llstreamingaudio_fmodstudio.h
+++ b/indra/llaudio/llstreamingaudio_fmodstudio.h
@@ -70,4 +70,4 @@ class LLStreamingAudio_FMODSTUDIO : public LLStreamingAudioInterface
};
-#endif // LL_STREAMINGAUDIO_FMODEX_H
+#endif // LL_STREAMINGAUDIO_FMODSTUDIO_H
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index da1e87fda47..2907d9f5b3f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16167,7 +16167,7 @@
<key>FMODExProfilerEnable</key>
<map>
<key>Comment</key>
- <string>Enable profiler tool if using FMOD Ex</string>
+ <string>Enable profiler tool if using FMOD Ex or FMOD Studio</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -16178,7 +16178,7 @@
<key>FMODExDecodeBufferSize</key>
<map>
<key>Comment</key>
- <string>Sets the streaming decode buffer size (in milliseconds)</string>
+ <string>Sets the streaming decode buffer size (in milliseconds) for FMOD Ex or FMOD Studio</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -16189,7 +16189,7 @@
<key>FMODExStreamBufferSize</key>
<map>
<key>Comment</key>
- <string>Sets the streaming buffer size (in milliseconds)</string>
+ <string>Sets the streaming buffer size (in milliseconds) for FMOD Ex or FMOD Studio</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
--
GitLab