diff options
Diffstat (limited to '')
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamer.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 2191d3c..6fd7771 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,9 @@ | |||
1 | 2009-04-06 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-04-06 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/llmedia/llmediaimplgstreamer.cpp: | ||
4 | Don't use LL_ERRS, it makes the viewer abort! | ||
5 | |||
6 | |||
3 | * linden/indra/llcommon/llerror.cpp: | 7 | * linden/indra/llcommon/llerror.cpp: |
4 | Made LogLock mutex less likely to fail, hopefully. | 8 | Made LogLock mutex less likely to fail, hopefully. |
5 | 9 | ||
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 5ec9eaf..7eb2b7b 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp | |||
@@ -357,7 +357,7 @@ void LLMediaImplGStreamer::gstreamer_log(GstDebugCategory *category, | |||
357 | switch( level ) | 357 | switch( level ) |
358 | { | 358 | { |
359 | case GST_LEVEL_ERROR: | 359 | case GST_LEVEL_ERROR: |
360 | LL_ERRS("MediaImpl") << log.str() << LL_ENDL; | 360 | LL_WARNS("MediaImpl") << "(ERROR) " << log.str() << LL_ENDL; |
361 | break; | 361 | break; |
362 | case GST_LEVEL_WARNING: | 362 | case GST_LEVEL_WARNING: |
363 | LL_WARNS("MediaImpl") << log.str() << LL_ENDL; | 363 | LL_WARNS("MediaImpl") << log.str() << LL_ENDL; |