diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
| commit | a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch) | |
| tree | 051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff) | |
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 08a73b343c..cc35328887 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1724,15 +1724,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use void optionally_start_music(const LLString& music_url) { - if (gSavedSettings.getWarning("FirstStreamingMusic")) - { - std::string* newstring = new std::string(music_url); - gViewerWindow->alertXml("ParcelCanPlayMusic", - callback_start_music, - (void*)newstring); - - } - else if (gSavedSettings.getBOOL("AudioStreamingMusic")) + if (gSavedSettings.getBOOL("AudioStreamingMusic")) { // Make the user click the start button on the overlay bar. JC // llinfos << "Starting parcel music " << music_url << llendl; @@ -1747,30 +1739,6 @@ void optionally_start_music(const LLString& music_url) } -void callback_start_music(S32 option, void* data) -{ - std::string* music_url = (std::string*)data; - - if (0 == option) - { - gSavedSettings.setBOOL("AudioStreamingMusic", TRUE); - llinfos << "Starting first parcel music " << music_url << llendl; - if ( gOverlayBar && gOverlayBar->musicPlaying()) - { - gAudiop->startInternetStream(music_url->c_str()); - } - } - else - { - gSavedSettings.setBOOL("AudioStreamingMusic", FALSE); - } - - gSavedSettings.setWarning("FirstStreamingMusic", FALSE); - - delete music_url; - music_url = NULL; -} - // static void LLViewerParcelMgr::processParcelAccessListReply(LLMessageSystem *msg, void **user) { |