aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelaudioprefs.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2011-03-21 16:30:09 +0100
committerArmin Weatherwax2011-03-21 16:30:09 +0100
commit53a45c182e97bb1c2e4a2edd6b020b2857269f62 (patch)
treeaf9e117734fea858845aac503c1bb18501aa89b9 /linden/indra/newview/llpanelaudioprefs.cpp
parentseveral embedded browser proxy fixes and one small cookie fix (diff)
downloadmeta-impy-53a45c182e97bb1c2e4a2edd6b020b2857269f62.zip
meta-impy-53a45c182e97bb1c2e4a2edd6b020b2857269f62.tar.gz
meta-impy-53a45c182e97bb1c2e4a2edd6b020b2857269f62.tar.bz2
meta-impy-53a45c182e97bb1c2e4a2edd6b020b2857269f62.tar.xz
allow interaction with parcel web media
* the media face gets focus on click and you can interact with mouse and keyboard with it - just as you would expect it to work in the first place anyway. * added a checkbox in prefs audio & video for what I call "media helper widget" which allows zooming on the face, open the link in a browser window and such - the name of the LL debug setting is a bit misleading ("MediaOnAPrimUI"), since this is not MOAP I avoided that name.
Diffstat (limited to 'linden/indra/newview/llpanelaudioprefs.cpp')
-rw-r--r--linden/indra/newview/llpanelaudioprefs.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index 1acfcbb..f1a8af5 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -112,6 +112,7 @@ void LLPanelAudioPrefs::refreshValues()
112 112
113 mPreviousStreamingMusic = gSavedSettings.getBOOL("AudioStreamingMusic"); 113 mPreviousStreamingMusic = gSavedSettings.getBOOL("AudioStreamingMusic");
114 mPreviousStreamingVideo = gSavedSettings.getBOOL("AudioStreamingVideo"); 114 mPreviousStreamingVideo = gSavedSettings.getBOOL("AudioStreamingVideo");
115 mPreviousHelperWidget = gSavedSettings.getBOOL("MediaOnAPrimUI");
115 116
116 mPreviousMuteAudio = gSavedSettings.getBOOL("MuteAudio"); 117 mPreviousMuteAudio = gSavedSettings.getBOOL("MuteAudio");
117 mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized"); 118 mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized");
@@ -140,7 +141,7 @@ void LLPanelAudioPrefs::cancel()
140 141
141 gSavedSettings.setBOOL("AudioStreamingMusic", mPreviousStreamingMusic ); 142 gSavedSettings.setBOOL("AudioStreamingMusic", mPreviousStreamingMusic );
142 gSavedSettings.setBOOL("AudioStreamingVideo", mPreviousStreamingVideo ); 143 gSavedSettings.setBOOL("AudioStreamingVideo", mPreviousStreamingVideo );
143 144 gSavedSettings.setBOOL("MediaOnAPrimUI", mPreviousHelperWidget );
144 145
145 gSavedSettings.setBOOL("MuteAudio", mPreviousMuteAudio ); 146 gSavedSettings.setBOOL("MuteAudio", mPreviousMuteAudio );
146 gSavedSettings.setBOOL("MuteWhenMinimized", mPreviousMuteWhenMinimized ); 147 gSavedSettings.setBOOL("MuteWhenMinimized", mPreviousMuteWhenMinimized );