aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llagent.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llagent.cpp')
-rw-r--r--linden/indra/newview/llagent.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 022e1cc..8b118e0 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -5991,7 +5991,7 @@ void LLAgent::teleportViaLandmark(const LLUUID& landmark_asset_id)
5991{ 5991{
5992// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d) 5992// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
5993 if ( (rlv_handler_t::isEnabled()) && 5993 if ( (rlv_handler_t::isEnabled()) &&
5994 ( (gRlvHandler.hasBehaviour("tplm")) || 5994 ( (gRlvHandler.hasBehaviour(RLV_BHVR_TPLM)) ||
5995 ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting)) )) 5995 ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting)) ))
5996 { 5996 {
5997 return; 5997 return;
@@ -6065,7 +6065,7 @@ void LLAgent::teleportViaLocation(const LLVector3d& pos_global)
6065// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-07 (RLVa-1.0.0d) 6065// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-07 (RLVa-1.0.0d)
6066 // If we're getting teleported due to @tpto we should disregard any @tploc=n or @unsit=n restrictions from the same object 6066 // If we're getting teleported due to @tpto we should disregard any @tploc=n or @unsit=n restrictions from the same object
6067 if ( (rlv_handler_t::isEnabled()) && 6067 if ( (rlv_handler_t::isEnabled()) &&
6068 ( (gRlvHandler.hasBehaviourExcept("tploc", gRlvHandler.getCurrentObject())) || 6068 ( (gRlvHandler.hasBehaviourExcept(RLV_BHVR_TPLOC, gRlvHandler.getCurrentObject())) ||
6069 ( (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) && 6069 ( (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) &&
6070 (gRlvHandler.hasBehaviourExcept(RLV_BHVR_UNSIT, gRlvHandler.getCurrentObject()))) ) ) 6070 (gRlvHandler.hasBehaviourExcept(RLV_BHVR_UNSIT, gRlvHandler.getCurrentObject()))) ) )
6071 { 6071 {