diff --git a/indra/llcharacter/llgesture.cpp b/indra/llcharacter/llgesture.cpp
index 1549c41e6..dd68622fb 100644
--- a/indra/llcharacter/llgesture.cpp
+++ b/indra/llcharacter/llgesture.cpp
@@ -287,7 +287,7 @@ U8 *LLGestureList::serialize(U8 *buffer) const
 	htonmemcpy(buffer, &count, MVT_S32, 4);
 	buffer += sizeof(count);
 
-	for (S32 i = 0; i < count; i++)
+	for (U32 i = 0; i < count; i++)
 	{
 		buffer = mList[i]->serialize(buffer);
 	}
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index fa8ec2be5..67aaee588 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -569,7 +569,7 @@ namespace LLError
 		mTags(new const char*[tag_count]),
 		mTagCount(tag_count)
 	{
-		for (int i = 0; i < tag_count; i++)
+		for (size_t i = 0; i < tag_count; i++)
 		{
 			mTags[i] = tags[i];
 		}
diff --git a/indra/newview/daeexport.cpp b/indra/newview/daeexport.cpp
index 5d49c96eb..71697251c 100644
--- a/indra/newview/daeexport.cpp
+++ b/indra/newview/daeexport.cpp
@@ -104,7 +104,7 @@ namespace DAEExportUtil
 
 		// See if any of the inventory items matching this texture id are exportable
 		ExportPolicy policy = LFSimFeatureHandler::instance().exportPolicy();
-		for (S32 i = 0; i < items.size(); i++)
+		for (size_t i = 0; i < items.size(); i++)
 		{
 			const LLPermissions item_permissions = items[i]->getPermissions();
 			if (item_permissions.allowExportBy(gAgentID, policy))
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index 357b916bb..fdb17346b 100644
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -771,9 +771,9 @@ LLFloaterNotRunQueue::~LLFloaterNotRunQueue()
 void LLFloaterCompileQueue::removeItemByItemID(const LLUUID& asset_id)
 {
 	LL_INFOS() << "LLFloaterCompileQueue::removeItemByAssetID()" << LL_ENDL;
-	for(S32 i = 0; i < mCurrentScripts.size(); )
+	for(size_t i = 0; i < mCurrentScripts.size(); )
 	{
-		if(asset_id == mCurrentScripts.at(i)->getUUID())
+		if(asset_id == mCurrentScripts[i]->getUUID())
 		{
 			vector_replace_with_last(mCurrentScripts, mCurrentScripts.begin() + i);
 		}
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 9402c4f94..ba8d99b40 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -582,13 +582,13 @@ bool handleWindlightCloudChanged(const LLSD& new_value)
 	{
 		cloudNoiseFilename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/clouds", "Default.tga");
 	}
-	llinfos << "loading WindLight cloud noise from " << cloudNoiseFilename << LL_ENDL;
+	LL_INFOS() << "loading WindLight cloud noise from " << cloudNoiseFilename << LL_ENDL;
 
 	LLPointer<LLImageFormatted> cloudNoiseFile(LLImageFormatted::createFromExtension(cloudNoiseFilename));
 
 	if (cloudNoiseFile.isNull())
 	{
-		llwarns << "Error: Failed to load cloud noise image " << cloudNoiseFilename << LL_ENDL;
+		LL_WARNS() << "Error: Failed to load cloud noise image " << cloudNoiseFilename << LL_ENDL;
 		return true;
 	}
 
@@ -599,7 +599,7 @@ bool handleWindlightCloudChanged(const LLSD& new_value)
 		if (cloudNoiseFile->decode(LLDrawPoolWLSky::sCloudNoiseRawImage, 0.0f))
 		{
 			//debug use
-			lldebugs << "cloud noise raw image width: " << LLDrawPoolWLSky::sCloudNoiseRawImage->getWidth() << " : height: " << LLDrawPoolWLSky::sCloudNoiseRawImage->getHeight() << " : components: " <<
+			LL_DEBUGS() << "cloud noise raw image width: " << LLDrawPoolWLSky::sCloudNoiseRawImage->getWidth() << " : height: " << LLDrawPoolWLSky::sCloudNoiseRawImage->getHeight() << " : components: " <<
 				(S32) LLDrawPoolWLSky::sCloudNoiseRawImage->getComponents() << " : data size: " << LLDrawPoolWLSky::sCloudNoiseRawImage->getDataSize() << LL_ENDL;
 			llassert_always(LLDrawPoolWLSky::sCloudNoiseRawImage->getData());
 
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp
index a0b8993cb..9ba3b804a 100644
--- a/indra/newview/llviewerjointmesh.cpp
+++ b/indra/newview/llviewerjointmesh.cpp
@@ -110,7 +110,7 @@ static LLVector4	gJointPivot[32];
 //-----------------------------------------------------------------------------
 void LLViewerJointMesh::uploadJointMatrices()
 {
-	S32 joint_num;
+	U32 joint_num;
 	LLPolyMesh *reference_mesh = mMesh->getReferenceMesh();
 	LLDrawPool *poolp = mFace ? mFace->getPool() : NULL;
 	BOOL hardware_skinning = (poolp && poolp->getVertexShaderLevel() > 0) ? TRUE : FALSE;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index f180cb158..14f3fab13 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1716,7 +1716,7 @@ void LLVOAvatar::getSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
 	for (polymesh_map_t::iterator i = mPolyMeshes.begin(); i != mPolyMeshes.end(); ++i)
 	{
 		LLPolyMesh* mesh = i->second;
-		for (S32 joint_num = 0; joint_num < mesh->mJointRenderData.size(); joint_num++)
+		for (U32 joint_num = 0; joint_num < mesh->mJointRenderData.size(); joint_num++)
 		{
 			update_min_max(newMin, newMax, mesh->mJointRenderData[joint_num]->mWorldMatrix->getRow<LLMatrix4a::ROW_TRANS>());
 		}