diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 06a7ab6d7586306e1a0d408f5ea3e24d11aa58ca..0a61e33532d4cc265cd981f468cb855639f82c69 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -24,57 +24,30 @@ else (USESYSTEMLIBS)
   set(addrsfx "-x${ADDRESS_SIZE}")
 
   if (WINDOWS)
-    if(MSVC80)
-      # This should be obsolete at this point
-      set(BOOST_VERSION "1.55")
-      set(BOOST_CONTEXT_LIBRARY 
-          optimized libboost_context-vc80-mt-${BOOST_VERSION}
-          debug libboost_context-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_FILESYSTEM_LIBRARY 
-          optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
-          debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
-          debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc80-mt-${BOOST_VERSION}
-          debug libboost_regex-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc80-mt-${BOOST_VERSION}
-          debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_SYSTEM_LIBRARY 
-          optimized libboost_system-vc80-mt-${BOOST_VERSION}
-          debug libboost_system-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_THREAD_LIBRARY 
-          optimized libboost_thread-vc80-mt-${BOOST_VERSION}
-          debug libboost_thread-vc80-mt-gd-${BOOST_VERSION})
-    else(MSVC80)
-      # MSVC 10.0 config
-      set(BOOST_CONTEXT_LIBRARY 
-          optimized libboost_context-mt${addrsfx}
-          debug libboost_context-mt${addrsfx}-gd)
-      set(BOOST_FIBER_LIBRARY 
-          optimized libboost_fiber-mt${addrsfx}
-          debug libboost_fiber-mt${addrsfx}-gd)
-      set(BOOST_FILESYSTEM_LIBRARY 
-          optimized libboost_filesystem-mt${addrsfx}
-          debug libboost_filesystem-mt${addrsfx}-gd)
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-mt${addrsfx}
-          debug libboost_program_options-mt${addrsfx}-gd)
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-mt${addrsfx}
-          debug libboost_regex-mt${addrsfx}-gd)
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-mt${addrsfx}
-          debug libboost_signals-mt${addrsfx}-gd)
-      set(BOOST_SYSTEM_LIBRARY 
-          optimized libboost_system-mt${addrsfx}
-          debug libboost_system-mt${addrsfx}-gd)
-      set(BOOST_THREAD_LIBRARY 
-          optimized libboost_thread-mt${addrsfx}
-          debug libboost_thread-mt${addrsfx}-gd)
-    endif (MSVC80)
+    set(BOOST_CONTEXT_LIBRARY
+        optimized libboost_context-mt${addrsfx}
+        debug libboost_context-mt${addrsfx}-gd)
+    set(BOOST_FIBER_LIBRARY
+        optimized libboost_fiber-mt${addrsfx}
+        debug libboost_fiber-mt${addrsfx}-gd)
+    set(BOOST_FILESYSTEM_LIBRARY
+        optimized libboost_filesystem-mt${addrsfx}
+        debug libboost_filesystem-mt${addrsfx}-gd)
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY
+        optimized libboost_program_options-mt${addrsfx}
+        debug libboost_program_options-mt${addrsfx}-gd)
+    set(BOOST_REGEX_LIBRARY
+        optimized libboost_regex-mt${addrsfx}
+        debug libboost_regex-mt${addrsfx}-gd)
+    set(BOOST_SIGNALS_LIBRARY
+        optimized libboost_signals-mt${addrsfx}
+        debug libboost_signals-mt${addrsfx}-gd)
+    set(BOOST_SYSTEM_LIBRARY
+        optimized libboost_system-mt${addrsfx}
+        debug libboost_system-mt${addrsfx}-gd)
+    set(BOOST_THREAD_LIBRARY
+        optimized libboost_thread-mt${addrsfx}
+        debug libboost_thread-mt${addrsfx}-gd)
   elseif (LINUX)
     set(BOOST_CONTEXT_LIBRARY
         optimized boost_context-mt${addrsfx}
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index e2469f3c7e651275c33b67c54138e04a0dba8526..e25dae8a90113d4b70e17ae8acd320eaf8cdc4dc 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -463,13 +463,13 @@ BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entr
         }
         else if ("time" == keyword)
         {
-            S32 when;
+            S32 when{};
             LLStringUtil::convertToS32(value, when);
             entry->mTime = when;
         }
         else if ("flags" == keyword)
         {
-            U32 setting;
+            U32 setting{};
             LLStringUtil::convertToU32(value, setting);
             entry->mFlags = setting;
         }
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 37344056e10ac4c600c4d84a48ebfb60e0f0757c..47090945912423ef1db87e5f70e7ca9b392d6675 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -1263,7 +1263,7 @@ BOOL LLViewerTextureList::createUploadFile(const std::string& filename,
 	LLPointer<LLImageFormatted> image = LLImageFormatted::createFromType(codec);
 	if (image.isNull())
 	{
-		image->setLastError("Couldn't open the image to be uploaded.");
+		LL_WARNS() << "Couldn't open the image to be uploaded." << LL_ENDL;
 		return FALSE;
 	}	
 	if (!image->load(filename))