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

[RLVa] gRlvHandler.canStand --> RlvActions::canStand

Browse Source
This commit is contained in:
Inusaito Sayori
2014-01-28 04:31:34 -05:00
parent 88ae36f4e1
commit 02753bfc7d
8 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llselectmgr.cpp
View File

@@ -94,6 +94,7 @@
#include "hippogridmanager.h"
// [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1a)
#include "rlvactions.h"
#include "rlvhandler.h"
// [/RLVa:KB]
@@ -661,7 +662,7 @@ bool LLSelectMgr::enableLinkObjects()
}
}
// [RLVa:KB] - Checked: 2011-03-19 (RLVa-1.3.0f) | Modified: RLVa-0.2.0g
if ( (new_value) && ((rlv_handler_t::isEnabled()) && (!gRlvHandler.canStand())) )
if ( (new_value) && ((rlv_handler_t::isEnabled()) && (!RlvActions::canStand())) )
{
// Allow only if the avie isn't sitting on any of the selected objects
LLObjectSelectionHandle hSel = LLSelectMgr::getInstance()->getSelection();
@@ -683,7 +684,7 @@ bool LLSelectMgr::enableUnlinkObjects()
!first_editable_object->isAttachment() && !first_editable_object->isPermanentEnforced() &&
((root_object == NULL) || !root_object->isPermanentEnforced());
// [RLVa:KB] - Checked: 2011-03-19 (RLVa-1.3.0f) | Modified: RLVa-0.2.0g
if ( (new_value) && ((rlv_handler_t::isEnabled()) && (!gRlvHandler.canStand())) )
if ( (new_value) && ((rlv_handler_t::isEnabled()) && (!RlvActions::canStand())) )
{
// Allow only if the avie isn't sitting on any of the selected objects
LLObjectSelectionHandle hSel = LLSelectMgr::getInstance()->getSelection();