summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-17 18:55:01 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-17 18:55:01 -0500
commit9a30cde27b0b93eb5024b1dd558d1da282fee2fd (patch)
treee9c1cee558464f7620e57cfd17a8c750be75843a /indra
parent889456e8924738936a9ee51a55d54d29ddd88bee (diff)
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.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerinventory.cpp5
1 files changed, 0 insertions, 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();
}