summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-06-09 19:08:16 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-06-09 19:08:16 +0300
commit4f34d63f3e9b2d70bd24c2f49cce98da30df050e (patch)
treee34b76fc7ad3ac87a791fba44a0778fd3b2c8342 /indra/newview/llinventorybridge.cpp
parentd807db70e02c5e0d7232a1ccf134456f619c94ba (diff)
parent4976323af8fae67a06e856bc9801635da5bfd79f (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 3a9c5ba698..94d421f61c 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2208,13 +2208,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()