diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-23 17:53:31 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-23 17:53:31 +0300 |
commit | 738a651efaadb85ef4bec7a7995e9ee7b181949c (patch) | |
tree | 30b2962761876b70db2a022cafc2a5898540946d /indra/newview | |
parent | fa887f18e1a251fb29b93880cefda463ea2baec4 (diff) |
Fix line endings
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llinventorymodel.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 543db806d4..aad57b4e5b 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -958,16 +958,16 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask) << "." << LL_ENDL; new_parent_id = findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND); update_parent_on_server = true; - }
- else
- {
- // Probably not the best way to handle this, we might encounter real case of 'lost&found' at some point
- LL_WARNS(LOG_INV) << "Update attempts to reparent item " << item->getUUID()
- << " to null folder. Old parent not null. Moving to old parent. Old item name: " << old_item->getName()
- << ". New name: " << item->getName()
- << "." << LL_ENDL;
- new_parent_id = old_parent_id;
- update_parent_on_server = true;
+ } + else + { + // Probably not the best way to handle this, we might encounter real case of 'lost&found' at some point + LL_WARNS(LOG_INV) << "Update attempts to reparent item " << item->getUUID() + << " to null folder. Old parent not null. Moving to old parent. Old item name: " << old_item->getName() + << ". New name: " << item->getName() + << "." << LL_ENDL; + new_parent_id = old_parent_id; + update_parent_on_server = true; } } |