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

Fix Issue 870: Crouch toggle not reset when pressing "Fly" button, causes avatar to run/fly downhill.

Browse Source 
Reimplements crouch toggle such that crouch is now tracked by the agent object
Fixes crouch being reset when restoring focus to the viewer window, as well.
This commit is contained in:
Inusaito Sayori
2014-01-24 22:57:19 -05:00
parent 2450b435a7
commit 236fa2a284
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llagent.cpp
View File

@@ -420,6 +420,7 @@ LLAgent::LLAgent() :
mNextFidgetTime(0.f),
mCurrentFidget(0),
mCrouch(false),
mFirstLogin(FALSE),
mGenderChosen(FALSE),
mAppearanceSerialNum(0),
@@ -639,13 +640,14 @@ void LLAgent::moveUp(S32 direction)
if (direction > 0)
{
setControlFlags(AGENT_CONTROL_UP_POS | AGENT_CONTROL_FAST_UP);
mCrouch = false;
}
else if (direction < 0)
{
setControlFlags(AGENT_CONTROL_UP_NEG | AGENT_CONTROL_FAST_UP);
}
if (!isCrouch) camera_reset_on_motion();
if (!mCrouch) camera_reset_on_motion();
}
//-----------------------------------------------------------------------------
@@ -687,6 +689,11 @@ void LLAgent::movePitch(F32 mag)
}
}
bool LLAgent::isCrouching() const
{
return mCrouch && !getFlying(); // Never crouch when flying
}
// Does this parcel allow you to fly?
BOOL LLAgent::canFly()
@@ -770,6 +777,7 @@ void LLAgent::setFlying(BOOL fly)
{
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_FLY_COUNT);
}
mCrouch = false;
setControlFlags(AGENT_CONTROL_FLY);
}
else