From cae30e03dfec3b247ca59a926e1b49845c760c3b Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 30 Sep 2018 03:06:00 +0200
Subject: [PATCH 1/2] Fix apparently missing include in fsgridhandler.h

---
 indra/newview/fsgridhandler.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/fsgridhandler.h b/indra/newview/fsgridhandler.h
index 330e11bfa3..1b1e8ad21f 100644
--- a/indra/newview/fsgridhandler.h
+++ b/indra/newview/fsgridhandler.h
@@ -30,6 +30,7 @@
 #define FS_GRIDHANDLER_H
 
 #include "../llxml/llxmlnode.h"
+#include "llsingleton.h"
 
 #include <boost/function.hpp>
 #include <boost/signals2.hpp>

From ae6015ac3e9730caa727349985170dd221e7f31f Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Wed, 3 Oct 2018 10:13:00 +0100
Subject: [PATCH 2/2] Unreachable code introduced by addition of exceptions to
 out of memory handling

---
 indra/llimage/llimagejpeg.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
index 6b166769c1..69d05afafd 100644
--- a/indra/llimage/llimagejpeg.cpp
+++ b/indra/llimage/llimagejpeg.cpp
@@ -386,7 +386,9 @@ boolean LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )
   {
     self->setLastError("Out of memory in LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )");
     LLTHROW(LLContinueError("Out of memory in LLImageJPEG::encodeEmptyOutputBuffer( j_compress_ptr cinfo )"));
-  	return false;
+  //<FS:Beq> Fix unreachable code
+  //	return false;
+  //</FS:Beq>
   }
   memcpy( new_buffer, self->mOutputBuffer, self->mOutputBufferSize );	/* Flawfinder: ignore */
   delete[] self->mOutputBuffer;