From 9a30cde27b0b93eb5024b1dd558d1da282fee2fd Mon Sep 17 00:00:00 2001 From: Loren Shih <seraph@lindenlab.com> Date: Tue, 17 Nov 2009 18:55:01 -0500 Subject: EXT-2580 : Regression: Links are no longer PERM_NONE For some reason, we started using the baseobj's permissions instead of the link's permissions at some point. Reverting it back to using the link's permissions. --- indra/newview/llviewerinventory.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 1d62ead843..089535dfab 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1215,11 +1215,6 @@ void LLViewerInventoryItem::rename(const std::string& n) const LLPermissions& LLViewerInventoryItem::getPermissions() const { - if (const LLViewerInventoryItem *linked_item = getLinkedItem()) - { - return linked_item->getPermissions(); - } - // Use the actual permissions of the symlink, not its parent. return LLInventoryItem::getPermissions(); } -- cgit v1.2.3