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/newview | |
| parent | a68aa5bfee31c11a8d9d550972b0541d59cbd275 (diff) | |
Coding policy fixes
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 8 | ||||
| -rwxr-xr-x | indra/newview/llfloatermodeluploadbase.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
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 +} |