aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/llaudio/audioengine_openal.cpp8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 932a877..ce78186 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -4,6 +4,10 @@
4 4
52009-01-30 Jacek Antonelli <jacek.antonelli@gmail.com> 52009-01-30 Jacek Antonelli <jacek.antonelli@gmail.com>
6 6
7 * linden/indra/llaudio/audioengine_openal.cpp:
8 Disabled spammy loadWAV error for nonexistent files.
9
10
7 * linden/indra/newview/llviewerregion.cpp 11 * linden/indra/newview/llviewerregion.cpp
8 Fix crash with two instances logged in to opensim. 12 Fix crash with two instances logged in to opensim.
9 Patch by Armin Weatherwax. 13 Patch by Armin Weatherwax.
diff --git a/linden/indra/llaudio/audioengine_openal.cpp b/linden/indra/llaudio/audioengine_openal.cpp
index a956131..8f836a6 100644
--- a/linden/indra/llaudio/audioengine_openal.cpp
+++ b/linden/indra/llaudio/audioengine_openal.cpp
@@ -348,10 +348,10 @@ bool LLAudioBufferOpenAL::loadWAV(const std::string& filename)
348 else 348 else
349 { 349 {
350 // It's common for the file to not actually exist. 350 // It's common for the file to not actually exist.
351 LL_DEBUGS("OpenAL") << 351 //LL_DEBUGS("OpenAL") <<
352 "LLAudioBufferOpenAL::loadWAV() Error loading " 352 // "LLAudioBufferOpenAL::loadWAV() Error loading "
353 << filename 353 // << filename
354 << " " << alutGetErrorString(error) << LL_ENDL; 354 // << " " << alutGetErrorString(error) << LL_ENDL;
355 } 355 }
356 return false; 356 return false;
357 } 357 }