diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-13 20:55:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-13 20:55:47 -0400 |
| commit | f79b775fcc94b1bad6869a6977a5049f356630cc (patch) | |
| tree | 37f304fd7d22ed8d1cc58613b6706b751ebf14d3 /indra/newview/llinventorybridge.cpp | |
| parent | c7c7726c6f6c76950d47f9f640993bb80c659300 (diff) | |
| parent | b7e0e44e3246299b639f787e3ab9b8e59cdc05c3 (diff) | |
merge changes for drtvwr-136
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 1f948abfae..cae04ccb49 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -984,7 +984,7 @@ void LLInvFVBridge::changeItemParent(LLInventoryModel* model, const LLUUID& new_parent_id, BOOL restamp) { - change_item_parent(model, item, new_parent_id, restamp); + model->changeItemParent(item, new_parent_id, restamp); } // static @@ -993,7 +993,7 @@ void LLInvFVBridge::changeCategoryParent(LLInventoryModel* model, const LLUUID& new_parent_id, BOOL restamp) { - change_category_parent(model, cat, new_parent_id, restamp); + model->changeCategoryParent(cat, new_parent_id, restamp); } LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type, |