From f05549bd57907c3f8168e7cd9f42aa3219027c86 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Sat, 23 Oct 2010 21:35:43 +0200
Subject: IMP-661: WARNING: isFeatureAvailable: Feature RenderCubeMap not on
 feature list!

Fixes this warning. Note that LLCubeMap::sUseCubeMaps is set to true by
default, so this patch only has effect when the feature is actually NOT
available.

I tested that LLCubeMap::sUseCubeMaps is NOT used before the point where
it is initialized now.

The patch also adds an entry for IMP-660 to doc/contributions.txt that I
had forgotten in the previous commit; and while I was at it, changes all
RED- prefixes in IMP-.
---
 linden/indra/newview/llappviewer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden/indra')

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");
 
-- 
cgit v1.1