Removed warning regarding 'RenderCubeMap' feature upon startup
This commit is contained in:
@@ -450,8 +450,6 @@ static void settings_to_globals()
|
|||||||
gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
|
gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
|
||||||
LLWorldMapView::sMapScale = gSavedSettings.getF32("MapScale");
|
LLWorldMapView::sMapScale = gSavedSettings.getF32("MapScale");
|
||||||
LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
|
LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
|
||||||
|
|
||||||
LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void settings_modify()
|
static void settings_modify()
|
||||||
@@ -738,6 +736,9 @@ bool LLAppViewer::init()
|
|||||||
gGLActive = TRUE;
|
gGLActive = TRUE;
|
||||||
initWindow();
|
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
|
// call all self-registered classes
|
||||||
LLInitClassList::instance().fireCallbacks();
|
LLInitClassList::instance().fireCallbacks();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user