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

Port Hover Height from Alchemy, it's in quicksettings~

Browse Source 
Lots and lots of other sync~
Also has a command /hover
Added /resync command from Alchemy.
This commit is contained in:
Inusaito Sayori
2015-03-25 08:04:24 -04:00
parent a54937b4b8
commit 398014b118
35 changed files with 534 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
indra/newview/llagent.cpp
View File

@@ -396,7 +396,8 @@ LLAgent::LLAgent() :
mShowAvatar(TRUE),
mFrameAgent(),
mIsBusy(FALSE),
mIsAwaySitting(false),
mIsDoNotDisturb(false),
mControlFlags(0x00000000),
mbFlagsDirty(FALSE),
@@ -1427,12 +1428,13 @@ void LLAgent::setAFK()
{
sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_START);
setControlFlags(AGENT_CONTROL_AWAY | AGENT_CONTROL_STOP);
LL_INFOS("AFK") << "Setting Away" << LL_ENDL;
gAwayTimer.start();
if (isAgentAvatarValid() && !gAgentAvatarp->isSitting() && gSavedSettings.getBOOL("AlchemySitOnAway"))
gAgent.setSitDownAway(true);
if (gAFKMenu)
{
gAFKMenu->setLabel(LLTrans::getString("AvatarSetNotAway"));
}
}
}
@@ -1452,14 +1454,27 @@ void LLAgent::clearAFK()
{
sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_STOP);
clearControlFlags(AGENT_CONTROL_AWAY);
LL_INFOS("AFK") << "Clearing Away" << LL_ENDL;
if (isAgentAvatarValid() && gAgentAvatarp->isSitting() && gAgent.isAwaySitting())
gAgent.setSitDownAway(false);
if (gAFKMenu)
{
gAFKMenu->setLabel(LLTrans::getString("AvatarSetAway"));
}
}
}
//-----------------------------------------------------------------------------
// setSitDownAway(bool)
//-----------------------------------------------------------------------------
void LLAgent::setSitDownAway(bool go_away)
{
if (go_away)
gAgent.sitDown();
else
gAgent.standUp();
mIsAwaySitting = go_away;
}
//-----------------------------------------------------------------------------
// getAFK()
//-----------------------------------------------------------------------------
@@ -1469,39 +1484,25 @@ BOOL LLAgent::getAFK() const
}
//-----------------------------------------------------------------------------
// setBusy()
// setDoNotDisturb()
//-----------------------------------------------------------------------------
void LLAgent::setBusy()
void LLAgent::setDoNotDisturb(bool pIsDoNotDisturb)
{
sendAnimationRequest(ANIM_AGENT_BUSY, ANIM_REQUEST_START);
mIsBusy = TRUE;
sendAnimationRequest(ANIM_AGENT_BUSY, pIsDoNotDisturb ? ANIM_REQUEST_START : ANIM_REQUEST_STOP);
mIsDoNotDisturb = pIsDoNotDisturb;
if (gBusyMenu)
{
gBusyMenu->setLabel(LLTrans::getString("AvatarSetNotBusy"));
gBusyMenu->setLabel(LLTrans::getString(pIsDoNotDisturb ? "AvatarSetNotBusy" : "AvatarSetBusy"));
}
LLFloaterMute::getInstance()->updateButtons();
}
//-----------------------------------------------------------------------------
// clearBusy()
// isDoNotDisturb()
//-----------------------------------------------------------------------------
void LLAgent::clearBusy()
bool LLAgent::isDoNotDisturb() const
{
mIsBusy = FALSE;
sendAnimationRequest(ANIM_AGENT_BUSY, ANIM_REQUEST_STOP);
if (gBusyMenu)
{
gBusyMenu->setLabel(LLTrans::getString("AvatarSetBusy"));
}
LLFloaterMute::getInstance()->updateButtons();
}
//-----------------------------------------------------------------------------
// getBusy()
//-----------------------------------------------------------------------------
BOOL LLAgent::getBusy() const
{
return mIsBusy;
return mIsDoNotDisturb;
}