diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp
index 4c6620faba..ba7949ddb8 100644
--- a/indra/newview/fsdata.cpp
+++ b/indra/newview/fsdata.cpp
@@ -259,7 +259,7 @@ static void downloadCompleteScript(LLSD const &aData, std::string const &aURL, s
     LLXMLNodePtr xml_root;
     std::string stringData;
     stringData.assign( rawData.begin(), rawData.end() ); // LLXMLNode::parseBuffer wants a U8*, not a const U8*, so need to copy here just to be safe
-    if ( (!LLXMLNode::parseBuffer( reinterpret_cast< U8*> ( &stringData[0] ), stringData.size(), xml_root, NULL)) || (xml_root.isNull()) || (!xml_root->hasName("script_library")) )
+    if ( (!LLXMLNode::parseBuffer( reinterpret_cast< U8*> ( &stringData[0] ), (U32)stringData.size(), xml_root, NULL)) || (xml_root.isNull()) || (!xml_root->hasName("script_library")) )
     {
         LL_WARNS("fsdata") << "Could not read the script library data from "<< aURL << LL_ENDL;
         return;
@@ -274,7 +274,7 @@ static void downloadCompleteScript(LLSD const &aData, std::string const &aURL, s
     else
     {
         LL_INFOS("fsdata") << "Saving " << aFilename << LL_ENDL;
-        outfile.write(  &rawData[0], rawData.size() );
+        outfile.write(  &rawData[0], (S32)rawData.size() );
         outfile.close() ;
     }
 }
diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp
index fea8378b38..c7bd4bff65 100644
--- a/indra/newview/fsgridhandler.cpp
+++ b/indra/newview/fsgridhandler.cpp
@@ -121,7 +121,7 @@ void gridDownloadComplete( LLSD const &aData, LLGridManager* mOwner, GridEntry*
 
         std::string stringData;
         stringData.assign( rawData.begin(), rawData.end() ); // LLXMLNode::parseBuffer wants a U8*, not a const U8*, so need to copy here just to be safe
-        if(LLXMLNode::parseBuffer( reinterpret_cast< U8*> ( &stringData[0] ), stringData.size(), mData->info_root, NULL))
+        if(LLXMLNode::parseBuffer( reinterpret_cast< U8*> ( &stringData[0] ), (U32)stringData.size(), mData->info_root, NULL))
         {
             mOwner->gridInfoResponderCB(mData);
         }
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 52fd928290..b616d82813 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -326,7 +326,6 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() :
     mSpeakerMuteDirty(true),
     mMicVolume(0),
     mMicVolumeDirty(true),
-    mHidden(false), // <FS:Ansariel> Initialize...
 
     mVoiceEnabled(false),
     mProcessChannels(false),
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index a19497c986..d5d344e22c 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-1a9a3717fde5d0fb3d5f688a1a3dab7fcc2aa308
+1a9a3717fde5d0fb3d5f688a1a3dab7fcc2aa308
\ No newline at end of file