diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-26 09:36:40 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-26 09:36:40 +0200 |
| commit | 04729c1cd581e985247e5537fdcd46d78e5a9f1c (patch) | |
| tree | c8368ccb8e00e6128c9ef453a7f106ef433d0abc /indra/newview/llviewertexture.cpp | |
| parent | 5d7497aab21f9cfcd8b86c73c27dce33e8409841 (diff) | |
| parent | fbf605ea321ee29afad63a4afe47f65584d67eea (diff) | |
Merge with default branch
--HG--
branch : product-engine
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(); ) |