diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 0270d191ae683c8801a95fa5bf327c48ec473242..0d20d186056aaec5e44b24e56a567ed17d08661b 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1303,15 +1303,14 @@ namespace {
 	bool checkLevelMap(const LevelMap& map, const std::string& key,
 						LLError::ELevel& level)
 	{
-		bool stop_checking;
 		LevelMap::const_iterator i = map.find(key);
 		if (i == map.end())
 		{
-			return stop_checking = false;
+			return false;
 		}
 		
 			level = i->second;
-		return stop_checking = true;
+		return true;
 	}
 	
 	bool checkLevelMap(	const LevelMap& map, 
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index a7beab3e2a37d6a0f01d851f88b646d15bd6a42c..903ceea49dc14e5d2f242a5a4b5d94b0e915bb4a 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -201,7 +201,7 @@ S32 utf16chars_to_wchar(const U16* inchars, llwchar* outchar)
 {
 	const U16* base = inchars;
 	U16 cur_char = *inchars++;
-	llwchar char32 = cur_char;
+	llwchar char32;
 	if ((cur_char >= 0xD800) && (cur_char <= 0xDFFF))
 	{
 		// Surrogates
diff --git a/indra/llwindow/llappdelegate-objc.h b/indra/llwindow/llappdelegate-objc.h
index 0b38647b4a75930691ef41559d43a6e972270555..a3f5f1e20e5d87cfd81b9486aad787662004b82d 100644
--- a/indra/llwindow/llappdelegate-objc.h
+++ b/indra/llwindow/llappdelegate-objc.h
@@ -27,6 +27,9 @@
 #import <Cocoa/Cocoa.h>
 #import "llopenglview-objc.h"
 
+@interface LLApplication : NSApplication
+@end
+
 @interface LLAppDelegate : NSObject <NSApplicationDelegate> {
 	LLNSWindow *window;
 	NSWindow *inputWindow;
@@ -47,5 +50,3 @@
 - (bool) romanScript;
 @end
 
-@interface LLApplication : NSApplication
-@end
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 1c55406bf7048bb1ac924ff2ff7e49abbe489a07..f5e4963380548ddd8500c12b1b39c545044729df 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -597,8 +597,6 @@ void LLWindowMacOSX::getMouseDeltas(float* delta)
 
 BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits, BOOL fullscreen, BOOL disable_vsync)
 {
-	BOOL			glNeedsInit = FALSE;
-
 	mFullscreen = fullscreen;
 	
 	if (mWindow == NULL)
@@ -612,10 +610,7 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 		// Get the view instead.
 		mGLView = createOpenGLView(mWindow, mFSAASamples, !disable_vsync);
 		mContext = getCGLContextObj(mGLView);
-		
-		// Since we just created the context, it needs to be set up.
-		glNeedsInit = TRUE;
-		
+
 		gGLManager.mVRAM = getVramSize(mGLView);
 	}