2 files changed, 23 insertions, 20 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 1cbc2dd..863a275 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -62,24 +62,26 @@ Aleric Inglewood
         SNOW-766
         SNOW-796
         SNOW-800
-        RED-429
-        RED-552
-        RED-553
-        RED-554
-        RED-556
-        RED-560
-        RED-561
-        RED-562
-        RED-565
-        RED-566
-        RED-567
-        RED-573
-        RED-575
-        RED-576
-        RED-577
-        RED-578
-        RED-579
-        RED-581
+        IMP-429
+        IMP-552
+        IMP-553
+        IMP-554
+        IMP-556
+        IMP-560
+        IMP-561
+        IMP-562
+        IMP-565
+        IMP-566
+        IMP-567
+        IMP-573
+        IMP-575
+        IMP-576
+        IMP-577
+        IMP-578
+        IMP-579
+        IMP-581
+        IMP-660
+        IMP-661
 Alissa Sabre
         VWR-81
         VWR-83
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index dd97cbf..4485cdf 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -440,8 +440,6 @@ static void settings_to_globals()
         gMapScale = gSavedSettings.getF32("MapScale");
         LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
 
-        LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
-
         LLSlider::setScrollWheelMultiplier( gSavedSettings.getS32("SliderScrollWheelMultiplier") );
 
         LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("PersistShowLookAt");
@@ -779,6 +777,9 @@ bool LLAppViewer::init()
         //
         initWindow();
 
+        // initWindow also initializes the Feature List, so now we can initialize this global.
+        LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
+
         {
                 BOOL download = gSavedSettings.getBOOL("DownloadClientTags");