Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sione's Media Filter

Browse Source
This commit is contained in:
Siana Gearz
2011-04-08 19:53:41 +02:00
parent 0d3c91269b
commit fd8866c411
22 changed files with 1229 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llviewerparcelmgr.cpp
View File

@@ -86,7 +86,7 @@ LLPointer<LLViewerImage> sBlockedImage;
LLPointer<LLViewerImage> sPassImage;
// Local functions
void optionally_start_music(const std::string& music_url);
void optionally_start_music(LLParcel* parcel);
void callback_start_music(S32 option, void* data);
void optionally_prepare_video(const LLParcel *parcelp);
void callback_prepare_video(S32 option, void* data);
@@ -1689,7 +1689,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
{
if (music_url.substr(0,7) == "http://")
{
optionally_start_music(music_url);
optionally_start_music(parcel);
}
else
{
@@ -1717,18 +1717,18 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
};
}
void optionally_start_music(const std::string& music_url)
void optionally_start_music(LLParcel* parcel)
{
if (gSavedSettings.getBOOL("AudioStreamingMusic"))
{
// Make the user click the start button on the overlay bar. JC
// llinfos << "Starting parcel music " << music_url << llendl;
// llinfos << "Starting parcel music " << parcel->getMusicURL() << llendl;
// now only play music when you enter a new parcel if the control is in PLAY state
// changed as part of SL-4878
if ( gOverlayBar && gOverlayBar->musicPlaying())
if (gOverlayBar && gOverlayBar->musicPlaying())
{
gAudiop->startInternetStream(music_url);
LLViewerParcelMedia::playStreamingMusic(parcel);
}
}
}