livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-1568: Fix sit on AFK issues (standing up when sitting before)

Ansariel 2014-05-01 19:05:59 +02:00
parent 9a634fc2c5
commit a24e5dc9f2
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llagent.cpp
View File

@ -408,6 +408,7 @@ LLAgent::LLAgent() :
mIsAutorespond(FALSE),
mIsAutorespondNonFriends(FALSE),
mIsRejectTeleportOffers(FALSE), // <FS:PP> FIRE-1245: Option to block/reject teleport offers
mAfkSitting(false), // <FS:Ansariel> FIRE-1568: Fix sit on AFK issues (standing up when sitting before)
mControlFlags(0x00000000),
mbFlagsDirty(FALSE),
@ -1582,6 +1583,7 @@ void LLAgent::setAFK()
if (!gAgentAvatarp->isSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_SIT))
{
gAgent.sitDown();
gAgent.setIsAfkSitting(true);
}
}
// </FS:AO>
@ -1607,13 +1609,16 @@ void LLAgent::clearAFK()
// <FS:AO> if we sat while away, stand back up on clear
if (gSavedSettings.getBOOL("AvatarSitOnAway"))
{
if (gAgentAvatarp->isSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
if (gAgent.isAfkSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
{
gAgent.standUp();
}
}
// </FS:AO>
}
// <FS:Ansariel> FIRE-1568: Fix sit on AFK issues (standing up when sitting before)
gAgent.setIsAfkSitting(false);
}
//-----------------------------------------------------------------------------

8
indra/newview/llagent.h
View File

@ -442,6 +442,14 @@ public:
/// @brief ground-sit at agent's current position
void sitDown();
// <FS:Ansariel> FIRE-1568: Fix sit on AFK issues (standing up when sitting before)
void setIsAfkSitting(bool sitting) { mAfkSitting = sitting; }
bool isAfkSitting() const { return mAfkSitting; }
private:
bool mAfkSitting;
// </FS:Ansariel>
//--------------------------------------------------------------------
// Do Not Disturb
//--------------------------------------------------------------------