EXT-6957 Media Navigation & Interaction does not work for "Group" if "Anyone" is disabled.

reviewed by richard cc#216
meow-7.2.2
Leyla Farazha 2010-06-17 16:18:25 -07:00
parent abb0ccb762
commit abd4a4e966
1 changed files with 6 additions and 2 deletions

View File

@ -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