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

Merge branch 'future' of https://github.com/siana/SingularityViewer

Browse Source
This commit is contained in:
TighMacFanatic
2011-10-05 20:17:24 -04:00
parent a1628abec3 5ef79d571b
commit ed8fad3fd9
152 changed files with 4311 additions and 3249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/lloverlaybar.cpp
View File

@@ -324,11 +324,11 @@ void LLOverlayBar::refresh()
}
BOOL sitting = FALSE;
if (gAgent.getAvatarObject())
if (gAgentAvatarp)
{
// sitting = gAgent.getAvatarObject()->isSitting();
// sitting = gAgentAvatarp->isSitting();
// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
sitting = gAgent.getAvatarObject()->isSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT);
sitting = gAgentAvatarp->isSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT);
// [/RLVa:KB]
}
button = getChild<LLButton>("Stand Up");
@@ -450,7 +450,7 @@ void LLOverlayBar::onClickMouselook(void*)
void LLOverlayBar::onClickStandUp(void*)
{
// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) && (gAgent.getAvatarObject()->isSitting()) )
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (gAgentAvatarp) && (gAgentAvatarp->isSitting()) )
{
return;
}
@@ -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);
}
}
}