diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index 44dddd0034a8761c10e57acab8c26ada48f278d8..81d14c695b13c3ab9f18576117f14f6c156a7b63 100755
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -17,7 +17,7 @@ include(FreeType)
 include(Boost)
 
 include_directories(
-	${LLCOREHTTP_INCLUDE_DIRS}
+    ${LLCOREHTTP_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLCRASHLOGGER_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
@@ -67,14 +67,14 @@ target_link_libraries(linux-crash-logger
     ${LLMESSAGE_LIBRARIES}
     ${LLVFS_LIBRARIES}
     ${LLMATH_LIBRARIES}
-	${LLCOREHTTP_LIBRARIES}
+    ${LLCOREHTTP_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
-	${BOOST_CONTEXT_LIBRARY}
-	${BOOST_COROUTINE_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_COROUTINE_LIBRARY}
     ${UI_LIBRARIES}
     ${DB_LIBRARIES}
     ${FREETYPE_LIBRARIES}
-	${LIBRT_LIBRARY}
+    ${LIBRT_LIBRARY}
     )
 
 add_custom_target(linux-crash-logger-target ALL
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 9086691375947b403a78d27f162f3e655f252a48..9757679ce1bf57991bc182898d6e6b085a0fd95d 100755
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -87,7 +87,7 @@ set(llcommon_SOURCE_FILES
     llrefcount.cpp
     llrun.cpp
     llsd.cpp
-	llsdjson.cpp
+    llsdjson.cpp
     llsdparam.cpp
     llsdserialize.cpp
     llsdserialize_xml.cpp
@@ -196,7 +196,7 @@ set(llcommon_HEADER_FILES
     llrefcount.h
     llsafehandle.h
     llsd.h
-	llsdjson.h
+    llsdjson.h
     llsdparam.h
     llsdserialize.h
     llsdserialize_xml.h
diff --git a/indra/llcrashlogger/CMakeLists.txt b/indra/llcrashlogger/CMakeLists.txt
index c41e61c49763759aa3292c239dafce58a969af95..da23b46b7b1ad99b45ad2a4bd7205fbbef8c2fd2 100755
--- a/indra/llcrashlogger/CMakeLists.txt
+++ b/indra/llcrashlogger/CMakeLists.txt
@@ -11,7 +11,7 @@ include(LLVFS)
 include(LLXML)
 
 include_directories(
-	${LLCOREHTTP_INCLUDE_DIRS}
+    ${LLCOREHTTP_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 57710049a5f7b960410aa365de873c7561b0548d..faab1aec92063c3fe79f82e7ba4d2465f43acfa5 100755
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -50,7 +50,7 @@ set(llmessage_SOURCE_FILES
     llhttpclient.cpp
     llhttpconstants.cpp
     llhttpnode.cpp
-	llhttpsdhandler.cpp
+    llhttpsdhandler.cpp
     llhttpsender.cpp
     llinstantmessage.cpp
     lliobuffer.cpp
@@ -144,7 +144,7 @@ set(llmessage_HEADER_FILES
     llhttpconstants.h
     llhttpnode.h
     llhttpnodeadapter.h
-	llhttpsdhandler.h
+    llhttpsdhandler.h
     llhttpsender.h
     llinstantmessage.h
     llinvite.h
diff --git a/indra/llmessage/llhttpsdhandler.h b/indra/llmessage/llhttpsdhandler.h
index 814d1c22b591a1db6edf704fe7c3680f2f096e28..3b81dc66b9652ac995b61f2ced604c72639eb77f 100644
--- a/indra/llmessage/llhttpsdhandler.h
+++ b/indra/llmessage/llhttpsdhandler.h
@@ -69,4 +69,4 @@ class LLHttpSDGenericHandler : public LLHttpSDHandler
 private:
 	std::string mName;
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt
index ce20284b59e1e9bb2c6d0f3fc6f437e7f8a05be5..ab2038826101bf3e1bb1f1fce3fbe9267e711c8e 100755
--- a/indra/mac_crash_logger/CMakeLists.txt
+++ b/indra/mac_crash_logger/CMakeLists.txt
@@ -15,7 +15,7 @@ include(LLSharedLibs)
 include(Boost)
 
 include_directories(
-	${LLCOREHTTP_INCLUDE_DIRS}
+    ${LLCOREHTTP_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLCRASHLOGGER_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
@@ -74,10 +74,10 @@ target_link_libraries(mac-crash-logger
     ${LLMESSAGE_LIBRARIES}
     ${LLVFS_LIBRARIES}
     ${LLMATH_LIBRARIES}
-	${LLCOREHTTP_LIBRARIES}
+    ${LLCOREHTTP_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
-	${BOOST_CONTEXT_LIBRARY}
-	${BOOST_COROUTINE_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_COROUTINE_LIBRARY}
     )
 
 add_custom_command(
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 9949656fcc3c37ddd932d7d2a11ba3a80e7691f8..51787b6258e939cc1a232ea9fbac6f5d213fb1e7 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2311,11 +2311,11 @@ if (LL_TESTS)
     ${GOOGLEMOCK_LIBRARIES}
     )
 
-  if (LINUX)	
+  if (LINUX)
     # llcommon uses `clock_gettime' which is provided by librt on linux.
     set(LIBRT_LIBRARY
-	  rt
-	  )
+      rt
+      )
   endif (LINUX)
 
   set(test_libs
@@ -2328,7 +2328,7 @@ if (LL_TESTS)
     ${GOOGLEMOCK_LIBRARIES}
     ${OPENSSL_LIBRARIES}
     ${CRYPTO_LIBRARIES}
-	${LIBRT_LIBRARY}
+    ${LIBRT_LIBRARY}
     ${BOOST_CONTEXT_LIBRARY}
     ${BOOST_COROUTINE_LIBRARY}
   )
diff --git a/indra/newview/llfloatermodeluploadbase.cpp b/indra/newview/llfloatermodeluploadbase.cpp
index 644d45c16e6a673c61e86f762675dae7bb67034a..aa91a2ce034ef84ef9e29039fa657171e09332d0 100755
--- a/indra/newview/llfloatermodeluploadbase.cpp
+++ b/indra/newview/llfloatermodeluploadbase.cpp
@@ -90,4 +90,4 @@ void LLFloaterModelUploadBase::requestAgentUploadPermissionsCoro(LLCoros::self&
 
     result.erase(LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS);
     observer->onPermissionsReceived(result);
-}
\ No newline at end of file
+}
diff --git a/indra/viewer_components/updater/CMakeLists.txt b/indra/viewer_components/updater/CMakeLists.txt
index 2e284bf993bf9ca373d8f2865e1008b4ccea7720..53e309290f613164302a284054232308ba755477 100755
--- a/indra/viewer_components/updater/CMakeLists.txt
+++ b/indra/viewer_components/updater/CMakeLists.txt
@@ -16,7 +16,7 @@ include(LLVFS)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
-	${LLCOREHTTP_INCLUDE_DIRS}
+    ${LLCOREHTTP_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
     ${LLPLUGIN_INCLUDE_DIRS}
     ${LLVFS_INCLUDE_DIRS}
@@ -61,7 +61,7 @@ add_library(llupdaterservice
 
 target_link_libraries(llupdaterservice
     ${LLCOMMON_LIBRARIES}
-	${LLCOREHTTP_LIBRARIES}
+    ${LLCOREHTTP_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
     ${LLPLUGIN_LIBRARIES}
     ${LLVFS_LIBRARIES}
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index a52c8cc42b6c44dd13947fe34808bab6ddd34059..144d037a319e69436a60d2999adc836f1c23d920 100755
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -17,7 +17,7 @@ include(GoogleBreakpad)
 include(Boost)
 
 include_directories(
-	${LLCOREHTTP_INCLUDE_DIRS}
+    ${LLCOREHTTP_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLCRASHLOGGER_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
@@ -80,7 +80,7 @@ target_link_libraries(windows-crash-logger
     ${LLXML_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
     ${LLMATH_LIBRARIES}
-	${LLCOREHTTP_LIBRARIES}
+    ${LLCOREHTTP_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
     ${BOOST_CONTEXT_LIBRARY}
     ${BOOST_COROUTINE_LIBRARY}