diff options
author | Aleric Inglewood | 2010-10-23 21:35:43 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-10-23 21:35:43 +0200 |
commit | f05549bd57907c3f8168e7cd9f42aa3219027c86 (patch) | |
tree | a2ae6180764e83120a14cb831b3f36d89e403b22 /linden/indra/newview | |
parent | MP-660: Incorrect start up warnings (diff) | |
download | meta-impy-f05549bd57907c3f8168e7cd9f42aa3219027c86.zip meta-impy-f05549bd57907c3f8168e7cd9f42aa3219027c86.tar.gz meta-impy-f05549bd57907c3f8168e7cd9f42aa3219027c86.tar.bz2 meta-impy-f05549bd57907c3f8168e7cd9f42aa3219027c86.tar.xz |
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-.
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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() | |||
440 | gMapScale = gSavedSettings.getF32("MapScale"); | 440 | gMapScale = gSavedSettings.getF32("MapScale"); |
441 | LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips"); | 441 | LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips"); |
442 | 442 | ||
443 | LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"); | ||
444 | |||
445 | LLSlider::setScrollWheelMultiplier( gSavedSettings.getS32("SliderScrollWheelMultiplier") ); | 443 | LLSlider::setScrollWheelMultiplier( gSavedSettings.getS32("SliderScrollWheelMultiplier") ); |
446 | 444 | ||
447 | LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("PersistShowLookAt"); | 445 | LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("PersistShowLookAt"); |
@@ -779,6 +777,9 @@ bool LLAppViewer::init() | |||
779 | // | 777 | // |
780 | initWindow(); | 778 | initWindow(); |
781 | 779 | ||
780 | // initWindow also initializes the Feature List, so now we can initialize this global. | ||
781 | LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"); | ||
782 | |||
782 | { | 783 | { |
783 | BOOL download = gSavedSettings.getBOOL("DownloadClientTags"); | 784 | BOOL download = gSavedSettings.getBOOL("DownloadClientTags"); |
784 | 785 | ||