diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 15:58:56 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-19 15:58:56 -0700 |
| commit | ac17ec0c287246dbb00d21a6b4994949eac69737 (patch) | |
| tree | 3da999db2b63dbaa74a8c7ce2572e3f17df454dd /indra/newview/llinventorybridge.cpp | |
| parent | 77f795cae59f7fa52d57ba30469cb0ddb744ac4d (diff) | |
| parent | 61cb3d31137f30f3766dbe3c22d700fbdf517d80 (diff) | |
Merge pull from dessie/viewer-public
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 9e3f80e464..e394284c92 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -144,7 +144,6 @@ const std::string& LLInvFVBridge::getDisplayName() const // Folders have full perms PermissionMask LLInvFVBridge::getPermissionMask() const { - return PERM_ALL; } @@ -1220,18 +1219,7 @@ PermissionMask LLItemBridge::getPermissionMask() const { LLViewerInventoryItem* item = getItem(); PermissionMask perm_mask = 0; - if(item) - { - BOOL copy = item->getPermissions().allowCopyBy(gAgent.getID()); - BOOL mod = item->getPermissions().allowModifyBy(gAgent.getID()); - BOOL xfer = item->getPermissions().allowOperationBy(PERM_TRANSFER, - gAgent.getID()); - - if (copy) perm_mask |= PERM_COPY; - if (mod) perm_mask |= PERM_MODIFY; - if (xfer) perm_mask |= PERM_TRANSFER; - - } + if (item) perm_mask = item->getPermissionMask(); return perm_mask; } |