From 22a33cc8d72e2053c363efcd89823a387e5e518e Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 2 May 2018 16:15:43 +0300 Subject: fix line endings --- indra/newview/llinventorybridge.cpp | 8 ++++---- indra/newview/llinventoryfunctions.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'indra') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 29e63e4bca..90a000c196 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3807,10 +3807,10 @@ void LLFolderBridge::perform_pasteFromClipboard() break; } } - else if (item->getIsLinkType()) - { - link_inventory_object(parent_id, item_id, - LLPointer(NULL)); + else if (item->getIsLinkType()) + { + link_inventory_object(parent_id, item_id, + LLPointer(NULL)); } else { diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 4914490319..0da4331af8 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -425,9 +425,9 @@ void copy_inventory_category(LLInventoryModel* model, LLInventoryItem* item = *iter; LLPointer cb = new LLBoostFuncInventoryCallback(boost::bind(update_folder_cb, new_cat_uuid)); - if (item->getIsLinkType()) - { - link_inventory_object(new_cat_uuid, item->getLinkedUUID(), cb); + if (item->getIsLinkType()) + { + link_inventory_object(new_cat_uuid, item->getLinkedUUID(), cb); } else if(!item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID(), gAgent.getGroupID())) { -- cgit v1.2.3