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

[RLVa] Missed sections of canStand update in that last commit.

Browse Source
This commit is contained in:
Inusaito Sayori
2014-01-28 04:35:43 -05:00
parent 9c0d8bbeb1
commit dd35f1bd68
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llagent.cpp
View File

@@ -103,10 +103,11 @@
#include "lluictrlfactory.h" //For LLUICtrlFactory::getLayeredXMLNode #include "lluictrlfactory.h" //For LLUICtrlFactory::getLayeredXMLNode
// [RLVa:KB] - Checked: 2010-09-27 (RLVa-1.1.3b) // [RLVa:KB] - Checked: 2011-11-04 (RLVa-1.4.4a)
#include "rlvactions.h"
#include "rlvhandler.h" #include "rlvhandler.h"
#include "rlvinventory.h" #include "rlvhelper.h"
#include "llattachmentsmgr.h" #include "rlvui.h"
// [/RLVa:KB] // [/RLVa:KB]
#include "NACLantispam.h" // for NaCl Antispam Registry #include "NACLantispam.h" // for NaCl Antispam Registry
@@ -826,17 +827,20 @@ void LLAgent::standUp()
// setControlFlags(AGENT_CONTROL_STAND_UP); // setControlFlags(AGENT_CONTROL_STAND_UP);
// [RLVa:KB] - Checked: 2010-03-07 (RLVa-1.2.0c) | Added: RLVa-1.2.0a // [RLVa:KB] - Checked: 2010-03-07 (RLVa-1.2.0c) | Added: RLVa-1.2.0a
// RELEASE-RLVa: [SL-2.0.0] Check this function's callers since usually they require explicit blocking // RELEASE-RLVa: [SL-2.0.0] Check this function's callers since usually they require explicit blocking
if ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.canStand()) ) if ( (!rlv_handler_t::isEnabled()) || (RlvActions::canStand()) )
{ {
setControlFlags(AGENT_CONTROL_STAND_UP); setControlFlags(AGENT_CONTROL_STAND_UP);
} }
// [/RLVa:KB] // [/RLVa:KB]
} }
void LLAgent::handleServerBakeRegionTransition(const LLUUID& region_id) void LLAgent::handleServerBakeRegionTransition(const LLUUID& region_id)
{ {
llinfos << "called" << llendl; llinfos << "called" << llendl;
// Old-style appearance entering a server-bake region.
if (isAgentAvatarValid() && if (isAgentAvatarValid() &&
!gAgentAvatarp->isUsingServerBakes() && !gAgentAvatarp->isUsingServerBakes() &&
(mRegionp->getCentralBakeVersion()>0)) (mRegionp->getCentralBakeVersion()>0))
@@ -979,7 +983,6 @@ const LLHost& LLAgent::getRegionHost() const
} }
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// inPrelude() // inPrelude()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1156,7 +1159,7 @@ void LLAgent::sitDown()
// setControlFlags(AGENT_CONTROL_SIT_ON_GROUND); // setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
// [RLVa:KB] - Checked: 2010-08-28 (RLVa-1.2.1a) | Added: RLVa-1.2.1a // [RLVa:KB] - Checked: 2010-08-28 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
// RELEASE-RLVa: [SL-2.0.0] Check this function's callers since usually they require explicit blocking // RELEASE-RLVa: [SL-2.0.0] Check this function's callers since usually they require explicit blocking
if ( (!rlv_handler_t::isEnabled()) || ((gRlvHandler.canStand()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SIT))) ) if ( (!rlv_handler_t::isEnabled()) || ((RlvActions::canStand()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SIT))) )
{ {
setControlFlags(AGENT_CONTROL_SIT_ON_GROUND); setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
} }
@@ -4338,7 +4341,7 @@ void LLAgent::teleportViaLocationLookAt(const LLVector3d& pos_global)
// [RLVa:KB] - Checked: 2010-10-07 (RLVa-1.2.1f) | Added: RLVa-1.2.1f // [RLVa:KB] - Checked: 2010-10-07 (RLVa-1.2.1f) | Added: RLVa-1.2.1f
// RELEASE-RLVa: [SL-2.2.0] Make sure this isn't used for anything except double-click teleporting // RELEASE-RLVa: [SL-2.2.0] Make sure this isn't used for anything except double-click teleporting
if ( (rlv_handler_t::isEnabled()) && (!RlvUtil::isForceTp()) && if ( (rlv_handler_t::isEnabled()) && (!RlvUtil::isForceTp()) &&
((gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) || (!gRlvHandler.canStand())) ) ((gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) || (!RlvActions::canStand())) )
{ {
RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_TELEPORT); RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_TELEPORT);
return; return;