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

Merge with siana/future

Browse Source
This commit is contained in:
Shyotl
2011-10-13 00:03:56 -05:00
parent 4963a064f1
commit 008bebd817
169 changed files with 15033 additions and 2475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/lloverlaybar.cpp
View File

@@ -464,7 +464,7 @@ void LLOverlayBar::onClickStandUp(void*)
void LLOverlayBar::onClickCancelTP(void* data)
{
LLOverlayBar* self = (LLOverlayBar*)data;
self->setCancelTPButtonVisible(FALSE,std::string("Cancel"));
self->setCancelTPButtonVisible(FALSE, std::string("Cancel TP"));
gAgent.teleportCancel();
llinfos << "trying to cancel teleport" << llendl;
}
@@ -529,6 +529,7 @@ void LLOverlayBar::toggleMediaPlay(void*)
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if (parcel)
{
LLViewerParcelMedia::sIsUserAction = true;
LLViewerParcelMedia::play(parcel);
}
}
@@ -554,7 +555,8 @@ void LLOverlayBar::toggleMusicPlay(void*)
// stream is stopped, it doesn't return the right thing - commenting out for now.
// if ( gAudiop->isInternetStreamPlaying() == 0 )
{
gAudiop->startInternetStream(parcel->getMusicURL());
LLViewerParcelMedia::sIsUserAction = true;
LLViewerParcelMedia::playStreamingMusic(parcel);
}
}
}