Fix line endings

2 files changed, 12 insertions, 12 deletions

diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp
index 408adbde2b..7bea8e9f9c 100644
--- a/indra/llcorehttp/_httpoprequest.cpp
+++ b/indra/llcorehttp/_httpoprequest.cpp
@@ -1017,8 +1017,8 @@ CURLcode HttpOpRequest::curlSslCtxCallback(CURL *curl, void *sslctx, void *userd
         }
         else
         {
-            // disable any default verification for server certs

-            // Ex: setting urls (assume non-SL) for parcel media in LLFloaterURLEntry

+            // disable any default verification for server certs
+            // Ex: setting urls (assume non-SL) for parcel media in LLFloaterURLEntry
             SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
         }
 		// set the verification callback.
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;
             }
 		}