Fixed crash upon clicking media prim (disabled prim media control floater for now). Fleshed out media browser replacement (LLFloaterWebContent).

This commit is contained in:
Shyotl
2013-06-02 23:47:47 -05:00
parent c2cc65ecdc
commit 9c8cfcfd0a
22 changed files with 200 additions and 759 deletions

View File

@@ -111,7 +111,7 @@ void LLPanelAudioPrefs::refreshValues()
mPreviousHealthThreshold = gSavedSettings.getF32("UISndHealthReductionThreshold");
mPreviousStreamingMusic = gSavedSettings.getBOOL("AudioStreamingMusic");
mPreviousStreamingVideo = gSavedSettings.getBOOL("AudioStreamingVideo");
mPreviousStreamingVideo = gSavedSettings.getBOOL("AudioStreamingMedia");
mPreviousMuteAudio = gSavedSettings.getBOOL("MuteAudio");
mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized");
@@ -133,7 +133,7 @@ void LLPanelAudioPrefs::cancel()
gSavedSettings.setF32("UISndHealthReductionThreshold", mPreviousHealthThreshold );
gSavedSettings.setBOOL("AudioStreamingMusic", mPreviousStreamingMusic );
gSavedSettings.setBOOL("AudioStreamingVideo", mPreviousStreamingVideo );
gSavedSettings.setBOOL("AudioStreamingMedia", mPreviousStreamingVideo );
gSavedSettings.setBOOL("MuteAudio", mPreviousMuteAudio );