diff --git a/indra/llcommon/lluriparser.cpp b/indra/llcommon/lluriparser.cpp
index 43213ce125..a3b2d82373 100644
--- a/indra/llcommon/lluriparser.cpp
+++ b/indra/llcommon/lluriparser.cpp
@@ -29,8 +29,8 @@
 #include "linden_common.h"
 #include "lluriparser.h"
 
-#if !LL_WINDOWS
-#include <stdint.h>
+#if !LL_WINDOWS
+#include <stdint.h>
 #endif
 
 LLUriParser::LLUriParser(const std::string& u) : mTmpScheme(false), mRes(0)
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 6bf8de0124..189ddd97d8 100755
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -535,7 +535,7 @@ void LLLocalBitmap::updateUserSculpts(LLUUID old_id, LLUUID new_id)
 void LLLocalBitmap::updateUserLayers(LLUUID old_id, LLUUID new_id, LLWearableType::EType type)
 {
 	// <FS:Ansariel> FIRE-15787: Crash fix
-	if (!gAgentAvatarp)
+	if (!isAgentAvatarValid())
 	{
 		return;
 	}