diff -r b0bd26c5638a -r 98cbdd5ffe42 indra/newview/llappviewer.cpp
--- a/indra/newview/llappviewer.cpp	Wed Dec 15 18:05:09 2010 +0100
+++ b/indra/newview/llappviewer.cpp	Wed Dec 15 18:57:55 2010 +0100
@@ -471,8 +471,6 @@
 	gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc");
 	gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
 	LLWorldMapView::sMapScale = gSavedSettings.getF32("MapScale");
-
-	LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
 }
 
 static void settings_modify()
@@ -848,6 +846,9 @@
 	gGLActive = TRUE;
 	initWindow();
 
+	// initWindow also initializes the Feature List, so now we can initialize this global.
+	LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
+
 	// call all self-registered classes
 	LLInitClassList::instance().fireCallbacks();