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

Merge branch 'master' of https://github.com/LightDrake/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2013-07-16 09:50:58 -04:00
parent 824bec5d69 a9d23a049c
commit f9304faaec
50 changed files with 2413 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llpanelnearbymedia.cpp
View File

@@ -86,10 +86,11 @@ LLPanelNearByMedia::LLPanelNearByMedia(bool standalone_panel)
{
mHoverTimer.stop();
mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
gSavedSettings.getBOOL("MediaTentativeAutoPlay");
mParcelAudioAutoStart = gSavedSettings.getBOOL("MediaTentativeAutoPlay");
/*gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING) &&
gSavedSettings.getBOOL("MediaTentativeAutoPlay");*/
gSavedSettings.getControl(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING)->getSignal()->connect(boost::bind(&LLPanelNearByMedia::handleMediaAutoPlayChanged, this, _2));
//gSavedSettings.getControl(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING)->getSignal()->connect(boost::bind(&LLPanelNearByMedia::handleMediaAutoPlayChanged, this, _2));
mCommitCallbackRegistrar.add("MediaListCtrl.EnableAll", boost::bind(&LLPanelNearByMedia::onClickEnableAll, this));
mCommitCallbackRegistrar.add("MediaListCtrl.DisableAll", boost::bind(&LLPanelNearByMedia::onClickDisableAll, this));
@@ -911,7 +912,7 @@ void LLPanelNearByMedia::onClickParcelAudioPlay()
}
else
{
gAudiop->startInternetStream(LLViewerMedia::getParcelAudioURL());
LLViewerParcelMedia::playStreamingMusic(LLViewerParcelMgr::getInstance()->getAgentParcel());
}
}
@@ -1265,12 +1266,18 @@ void* createNearbyMediaPanel(void* userdata)
return new LLPanelNearByMedia(false);
}
LLFloaterNearbyMedia::LLFloaterNearbyMedia()
LLFloaterNearbyMedia::LLFloaterNearbyMedia() : mPanel(NULL)
{
mFactoryMap["nearby_media"] = LLCallbackMap(createNearbyMediaPanel, this);
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_nearby_media.xml",&mFactoryMap,false);
}
/*virtual*/ BOOL LLFloaterNearbyMedia::postBuild()
{
mPanel = getChild<LLPanelNearByMedia>("nearby_media",false,false);
return LLFloater::postBuild();
}
// static
void LLFloaterNearbyMedia::updateClass()
{