diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-10 23:44:55 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-10 23:51:39 +0300 |
| commit | f554fe2ca74ddf275e47cdce8537e04ab40f9f95 (patch) | |
| tree | 73adf5fc3e4353620f357cf753a9759fae5267bf /indra/newview/llselectmgr.cpp | |
| parent | 55477e74c79228feb9a5a2d8b970bb9cce2e57a1 (diff) | |
SL-10326 Allow selecting any movable avatars with 'Allow Select Avatar' option
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 9fd5eb28c1..50884762a8 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -3931,11 +3931,11 @@ BOOL LLSelectMgr::selectGetAggregateTexturePermissions(LLAggregatePermissions& r return TRUE; } -BOOL LLSelectMgr::isSelfAvatarSelected() +BOOL LLSelectMgr::isMovableAvatarSelected() { if (mAllowSelectAvatar) { - return (getSelection()->getObjectCount() == 1) && (getSelection()->getFirstRootObject() == gAgentAvatarp); + return (getSelection()->getObjectCount() == 1) && (getSelection()->getFirstRootObject()->isAvatar()) && getSelection()->getFirstMoveableNode(TRUE); } return FALSE; } |