diff --git a/.hgtags b/.hgtags
index c65fb39d71c64014600b43c5edc414129b247d76..6eea987748e8343e245134653ea046c7fd8958ef 100755
--- a/.hgtags
+++ b/.hgtags
@@ -378,3 +378,4 @@ ab0aa2f6ba22b52fed30a2337197f589156edc75 DRTVWR-253
 c23d734065ed593b2413385aecd8366d8e0ee96b DRTVWR-257
 452ce96d4046dc05a3ecaecc203e2cc8ddd72e76 DRTVWR-259
 5cba5f39d0a81d659f24ebc4b5efd025a39e3db1 3.4.3-release
+9aa1aa9f1fe13c194695a0b8f0af298296241dc2 DRTVWR-260
diff --git a/BuildParams b/BuildParams
index 6a0e30e5269605fba2780c9b98339b34c0f68a4e..c8edfeaa2fad6a9fa16e9319921b914d9e5ccc09 100644
--- a/BuildParams
+++ b/BuildParams
@@ -21,13 +21,8 @@ email_status_this_is_os = true
 # Limit extent of codeticket updates to revisions after...
 codeticket_since = 3.3.0-release
 
-clean_on_success = false
-run_tests = false
-build_Darwin_Debug = false
-build_Darwin_RelWithDebInfo = false
-    
 # ========================================
-# Viewer Development --
+# Viewer Development
 # ========================================
 
 # Report changes since...
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 543075db5bee22d520950149d38bb5982eb07ce1..21a0c8a9cad82d777782b1f531874b69a98f3657 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -201,19 +201,13 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
   endif(TEST_DEBUG)
   ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})
   SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
-  if (WINDOWS)
-    set_target_properties(INTEGRATION_TEST_${testname}
-      PROPERTIES 
-      LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc"
-      LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO"
-      LINK_FLAGS_RELEASE ""
-      )
-  endif(WINDOWS)
 
   if(STANDALONE)
     SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}")
   endif(STANDALONE)
 
+  # The following was copied to llcorehttp/CMakeLists.txt's texture_load target. 
+  # Any changes made here should be replicated there.
   if (WINDOWS)
     SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname}
         PROPERTIES
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 82fb3f0d4e3bb10dd96a0b5f2f4d0425997aea52..9adfd0ed62d1d6d66830423d8e539373e0fbec9f 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -174,7 +174,7 @@ if (LL_TESTS)
     # The following come from LLAddBuildTest.cmake's INTEGRATION_TEST_xxxx target.
     set_target_properties(http_texture_load
                           PROPERTIES
-                          LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc"
+                          LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${TCMALLOC_LINK_FLAGS}"
                           LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO"
                           LINK_FLAGS_RELEASE ""
                           )