diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2018-07-16 17:27:29 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2018-07-16 17:27:29 +0000 |
| commit | 24648780469ca704a7bafaafa4f10dcda268d89a (patch) | |
| tree | 974ef0ae9f5f47538f96cb5924b8168e4bd57218 /indra/newview/llselectmgr.h | |
| parent | bb6e8372f4c7e0c80d49727a6f509e49a22083ee (diff) | |
| parent | 1e883c5b3936abd8791a7a0350bd2ddac1f72161 (diff) | |
Merged in andreykproductengine/maint-neko2 (pull request #656)
MAINT-8844 Fixed selection inconsistancies (inworld manipulation vs tool floater)
Approved-by: Simon Linden <simon@lindenlab.com>
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/llselectmgr.h')
| -rw-r--r-- | indra/newview/llselectmgr.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index e965dd80d5..87ac899325 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -675,6 +675,11 @@ public: // returns TRUE if all the nodes are valid. Accumulates // permissions in the parameter. BOOL selectGetPermissions(LLPermissions& perm); + + // returns TRUE if all the nodes are valid. Depends onto "edit linked" state + // Children in linksets are a bit special - they require not only move permission + // but also modify if "edit linked" is set, since you move them relative to parent + BOOL selectGetEditMoveLinksetPermissions(bool &move, bool &modify); // Get a bunch of useful sale information for the object(s) selected. // "_mixed" is true if not all objects have the same setting. |