diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-06-17 13:53:28 -0700 | 
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-06-17 13:53:28 -0700 | 
| commit | 4a4470af3210153e0909eb75d51de461d14a3128 (patch) | |
| tree | 630824f1d0d1032f846ef9802318b48ee2bea1a1 /indra | |
| parent | a68aa5bfee31c11a8d9d550972b0541d59cbd275 (diff) | |
Coding policy fixes
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/linux_crash_logger/CMakeLists.txt | 10 | ||||
| -rwxr-xr-x | indra/llcommon/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | indra/llcrashlogger/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | indra/llmessage/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/llmessage/llhttpsdhandler.h | 2 | ||||
| -rwxr-xr-x | indra/mac_crash_logger/CMakeLists.txt | 8 | ||||
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 8 | ||||
| -rwxr-xr-x | indra/newview/llfloatermodeluploadbase.cpp | 2 | ||||
| -rwxr-xr-x | indra/viewer_components/updater/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | indra/win_crash_logger/CMakeLists.txt | 4 | 
10 files changed, 24 insertions, 24 deletions
| diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index 44dddd0034..81d14c695b 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 9086691375..9757679ce1 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 c41e61c497..da23b46b7b 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 57710049a5..faab1aec92 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 814d1c22b5..3b81dc66b9 100644 --- a/indra/llmessage/llhttpsdhandler.h +++ b/indra/llmessage/llhttpsdhandler.h @@ -69,4 +69,4 @@ protected:  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 ce20284b59..ab20388261 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 9949656fcc..51787b6258 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 644d45c16e..aa91a2ce03 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 2e284bf993..53e309290f 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 a52c8cc42b..144d037a31 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} | 
