diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-25 10:05:07 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-25 10:05:07 -0800 |
| commit | 1d512c599a8dfedcf93d7b1aadb8d85ad0d7de64 (patch) | |
| tree | 28996f22e1ff43831279482b74ab6ee7cb0663bc /indra/newview/llviewertexture.cpp | |
| parent | f11f8b34478f0d408689fe7959f233567001374d (diff) | |
| parent | af83fe79d8d074d3056e6dff86dcf14d8e71c885 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 3f42cba561..b80dc7d902 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2777,7 +2777,6 @@ void LLViewerMediaTexture::updateClass() #if 0 //force to play media. gSavedSettings.setBOOL("AudioStreamingMedia", true) ; - gSavedSettings.setBOOL("AudioStreamingVideo", true) ; #endif for(media_map_t::iterator iter = sMediaMap.begin() ; iter != sMediaMap.end(); ) |