diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-04-14 22:23:24 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-04-14 22:23:24 -0400 |
| commit | ee87fd975faf403707908cd3c7d37f8431df46ac (patch) | |
| tree | b5bd5b42f7248db3aeeb92013eb18d983d7da505 /indra/newview/llinventoryfunctions.h | |
| parent | 11bbd7e10e0f9a3c4848e0b19acf4e4bd286a02a (diff) | |
DRTVWR-136: Remove redundant remove_(item|category)() functions.
Incoming changes from two different project repos left viewer-development with
LLInventoryModel::removeItem() and removeCategory() plus free functions
remove_item() and remove_category() in llinventoryfunctions.cpp.
remove_category() was actually the better implementation; migrated its body
into LLInventoryModel::removeCategory(). Clearly the previous state of affairs
-- with LLInventoryModel::removeItem() plus a remove_category() free function
in a very different source file -- fooled two different developers into
overlooking the other of the pair. Unfortunately we each added different
"missing" functions, leaving us with a complete set of four.
Fix existing references to remove_item() and remove_category() free functions.
Diffstat (limited to 'indra/newview/llinventoryfunctions.h')
| -rw-r--r-- | indra/newview/llinventoryfunctions.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h index 535d831e47..5cf9c528b0 100644 --- a/indra/newview/llinventoryfunctions.h +++ b/indra/newview/llinventoryfunctions.h @@ -57,10 +57,6 @@ void show_task_item_profile(const LLUUID& item_uuid, const LLUUID& object_id); void show_item_original(const LLUUID& item_uuid); -void remove_item(LLInventoryModel* model, const LLUUID& id); - -void remove_category(LLInventoryModel* model, const LLUUID& cat_id); - void rename_category(LLInventoryModel* model, const LLUUID& cat_id, const std::string& new_name); void copy_inventory_category(LLInventoryModel* model, LLViewerInventoryCategory* cat, const LLUUID& parent_id, const LLUUID& root_copy_id = LLUUID::null); |