diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-18 14:08:46 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-18 14:08:46 +0300 |
| commit | a8276dfd5998a7ef86668d7a8e3f9e8a7d124801 (patch) | |
| tree | edb2169b848d848d834fe6e418c397c10c89a5ff /indra/newview/llvovolume.cpp | |
| parent | 9aa710945685a2cae8cfc622f3dc3d900c1ab4c9 (diff) | |
| parent | cb50a2395bc37f1f7833171a976f67af9f2df66d (diff) | |
Merge from default branch
--HG--
branch : product-engine
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 |