diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-09 18:19:23 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-09 18:19:23 +0300 |
| commit | 48ccb5755e97926f528f22998826643b91b61e14 (patch) | |
| tree | b350b8dafcc9b79aadcdf50a9a3e5e2c55aff28b | |
| parent | 206aab29dc93579360a6df6a2a99857fb955d072 (diff) | |
EXT-6726 ADDITIONAL FIX Minor code cleanup.
Removed duplicated code from LLFolderBridge::isItemRenameable().
Requested by Richard at https://codereview.productengine.com/secondlife/r/466/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 5 |
2 files changed, 6 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() diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index ca6cede7e9..c86d463a08 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -309,6 +309,11 @@ BOOL get_is_category_removable(const LLInventoryModel* model, const LLUUID& id) BOOL get_is_category_renameable(const LLInventoryModel* model, const LLUUID& id) { + if (!model) + { + return FALSE; + } + LLViewerInventoryCategory* cat = model->getCategory(id); if (cat && !LLFolderType::lookupIsProtectedType(cat->getPreferredType()) && |