diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-10 11:41:59 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-10 11:41:59 -0400 |
| commit | a37f7ec200963ab97ecd0bc4059ecf4e94fe9232 (patch) | |
| tree | d1a2ce3f58dfffb806ea45b0669bf3d0b9d9d987 /indra/newview/llinventorybridge.cpp | |
| parent | 388318c5328d002e316d27500dc91560d176b414 (diff) | |
| parent | 9370ffac47665c309c28fb075b26d8da43192e23 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 293585cd9c..7ce96a6ac1 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2209,13 +2209,7 @@ void LLFolderBridge::determineFolderType() BOOL LLFolderBridge::isItemRenameable() const { - LLViewerInventoryCategory* cat = (LLViewerInventoryCategory*)getCategory(); - if(cat && !LLFolderType::lookupIsProtectedType(cat->getPreferredType()) - && (cat->getOwnerID() == gAgent.getID())) - { - return TRUE; - } - return FALSE; + return get_is_category_renameable(getInventoryModel(), mUUID); } void LLFolderBridge::restoreItem() |