diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 008e27f0610129c0e5631c3753ff9db4ce7bf714..39e318fa6b503bc960efb7b1d08e441759a2add1 100755
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -213,7 +213,7 @@ if (LINUX OR DARWIN)
   set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
   elseif (CMAKE_COMPILER_IS_CLANGXX)
     # These unused warnings really ought to be cleaned up over time
-    set(UNUSED_WARNINGS "-Wno-overloaded-virtual")
+    # set(UNUSED_WARNINGS "-Wno-overloaded-virtual")
     set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs ${UNUSED_WARNINGS}")
   endif()
 
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp
index 259187c52f60ea38dfa8adf4d3af22d2ea023c71..aabc195ba8e5e6d461625b0a186477b02250c0f2 100755
--- a/indra/llcommon/llfile.cpp
+++ b/indra/llcommon/llfile.cpp
@@ -807,7 +807,7 @@ std::streamsize llstdio_filebuf::xsgetn(char_type* __s, std::streamsize __n)
 	return __ret;
 }
 
-std::streamsize llstdio_filebuf::xsputn(char_type* __s, std::streamsize __n)
+std::streamsize llstdio_filebuf::xsputn(const char_type* __s, std::streamsize __n)
 {
 	// Optimization in the always_noconv() case, to be generalized in the
 	// future: when __n is sufficiently large we write directly instead of
diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h
index f56b22bf9affda2539ef7d23f962b969610aeeeb..0612071d67408114ad397829df201219ac764cd0 100755
--- a/indra/llcommon/llfile.h
+++ b/indra/llcommon/llfile.h
@@ -188,7 +188,7 @@ class LL_COMMON_API llstdio_filebuf : public _Myfb
 	/*virtual*/ int sync();
 
 	std::streamsize xsgetn(char_type*, std::streamsize);
-	std::streamsize xsputn(char_type*, std::streamsize);
+	std::streamsize xsputn(const char_type*, std::streamsize);
 #endif
 };