diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-17 16:18:25 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-17 16:18:25 -0700 |
| commit | abd4a4e966f71966694b95ed213553a0f007cd11 (patch) | |
| tree | cd1577f75bd40cd80a632233b409f7f84d70a9b5 /indra/newview/llvovolume.cpp | |
| parent | abb0ccb762f54127b38bd9a9be4a852e7e489d48 (diff) | |
EXT-6957 Media Navigation & Interaction does not work for "Group" if "Anyone" is disabled.
reviewed by richard cc#216
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index d6453111d7..24e2f745d4 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1978,9 +1978,13 @@ bool LLVOVolume::hasMediaPermission(const LLMediaEntry* media_entry, MediaPermTy } // Group permissions - else if (0 != (media_perms & LLMediaEntry::PERM_GROUP) && permGroupOwner()) + else if (0 != (media_perms & LLMediaEntry::PERM_GROUP)) { - return true; + LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(this); + if (obj_perm && gAgent.isInGroup(obj_perm->getGroup())) + { + return true; + } } // Owner permissions |