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/llviewermedia.cpp | |
| parent | 5d7497aab21f9cfcd8b86c73c27dce33e8409841 (diff) | |
| parent | fbf605ea321ee29afad63a4afe47f65584d67eea (diff) | |
Merge with default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index d712446d83..98d8780b34 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -940,7 +940,6 @@ bool LLViewerMedia::firstRunCallback(const LLSD& notification, const LLSD& respo { // user has elected to automatically play media. gSavedSettings.setBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING, TRUE); - gSavedSettings.setBOOL("AudioStreamingVideo", TRUE); gSavedSettings.setBOOL("AudioStreamingMusic", TRUE); gSavedSettings.setBOOL("AudioStreamingMedia", TRUE); @@ -961,7 +960,6 @@ bool LLViewerMedia::firstRunCallback(const LLSD& notification, const LLSD& respo { gSavedSettings.setBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING, FALSE); gSavedSettings.setBOOL("AudioStreamingMedia", FALSE); - gSavedSettings.setBOOL("AudioStreamingVideo", FALSE); gSavedSettings.setBOOL("AudioStreamingMusic", FALSE); } return false; |