diff options
| author | McCabe Maxsted | 2011-03-08 00:21:30 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-08 00:21:30 -0700 |
| commit | d5963bcdeff171d660567fca445688ea91ea9da6 (patch) | |
| tree | de89e7c53c4705296a1354affb5ccb9d3d94a199 /linden | |
| parent | Merge remote branch 'armin/weekly' into weekly (diff) | |
| download | meta-impy-d5963bcdeff171d660567fca445688ea91ea9da6.zip meta-impy-d5963bcdeff171d660567fca445688ea91ea9da6.tar.gz meta-impy-d5963bcdeff171d660567fca445688ea91ea9da6.tar.bz2 meta-impy-d5963bcdeff171d660567fca445688ea91ea9da6.tar.xz | |
Fixed bug where Windows sometimes didn't do streainreaming audio (failed because openal wasn't initing too, removed the check)
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llmediaremotectrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp index 48715fc..27a686d 100644 --- a/linden/indra/newview/llmediaremotectrl.cpp +++ b/linden/indra/newview/llmediaremotectrl.cpp | |||
| @@ -204,7 +204,7 @@ void LLMediaRemoteCtrl::enableMediaButtons() | |||
| 204 | } | 204 | } |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | if (gSavedSettings.getBOOL("AudioStreamingMusic") && gAudiop) | 207 | if (gSavedSettings.getBOOL("AudioStreamingMusic")) |
| 208 | { | 208 | { |
| 209 | if ( parcel && !parcel->getMusicURL().empty()) | 209 | if ( parcel && !parcel->getMusicURL().empty()) |
| 210 | { | 210 | { |