aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerparcelmgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerparcelmgr.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index cf36100..b0e1e78 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -51,7 +51,6 @@
51#include "llfirstuse.h" 51#include "llfirstuse.h"
52#include "llfloaterbuyland.h" 52#include "llfloaterbuyland.h"
53#include "llfloatergroups.h" 53#include "llfloatergroups.h"
54//#include "llfloaterhtml.h"
55#include "llfloatersellland.h" 54#include "llfloatersellland.h"
56#include "llfloatertools.h" 55#include "llfloatertools.h"
57#include "llnotify.h" 56#include "llnotify.h"
@@ -1712,6 +1711,21 @@ void optionally_start_music(const std::string& music_url)
1712 } 1711 }
1713} 1712}
1714 1713
1714
1715void callback_start_music(S32 option, void* data)
1716{
1717 if (option == 0)
1718 {
1719 // Before the callback, we verified the url was good.
1720 // We fetch again to avoid lag while loading.
1721 LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
1722 gAudiop->startInternetStream(parcel->getMusicURL());
1723
1724 LLOverlayBar::musicFirstRun();
1725 }
1726 gSavedSettings.setWarning("FirstStreamingMusic", FALSE);
1727}
1728
1715// static 1729// static
1716void LLViewerParcelMgr::processParcelAccessListReply(LLMessageSystem *msg, void **user) 1730void LLViewerParcelMgr::processParcelAccessListReply(LLMessageSystem *msg, void **user)
1717{ 1731{