Merge

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;

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>