From 02e1578365627b3be265fa733f1206897c51ee77 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 7 Oct 2011 14:38:00 -0400 Subject: storm-1581: modify feature table rules to increment version only when the intent is to reset all graphics preferences --- indra/newview/app_settings/settings.xml | 4 ++-- indra/newview/featuretable.txt | 4 ++++ indra/newview/featuretable_linux.txt | 4 ++++ indra/newview/featuretable_mac.txt | 4 ++++ indra/newview/featuretable_solaris.txt | 4 ++++ indra/newview/featuretable_xp.txt | 4 ++++ indra/newview/llstartup.cpp | 2 +- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- 8 files changed, 25 insertions(+), 5 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cc27bcce3a..dd94d293c4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4592,7 +4592,7 @@ LastGPUString Comment - [DO NOT MODIFY] previous GPU class for tracking hardware changes + [DO NOT MODIFY] previous GPU id string for tracking hardware changes Persist 1 Type @@ -4603,7 +4603,7 @@ LastFeatureVersion Comment - [DO NOT MODIFY] Version number for tracking hardware changes + [DO NOT MODIFY] Feature Table Version number for tracking rendering system changes Persist 1 Type diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index e12c2f7853..9ad313a9a7 100755 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -1,4 +1,8 @@ version 32 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index 6e962f3c56..2dbdf3a76e 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -1,4 +1,8 @@ version 27 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index 2690e8ec70..996e574350 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -1,4 +1,8 @@ version 30 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt index 7df75687f2..e7cae1abdc 100644 --- a/indra/newview/featuretable_solaris.txt +++ b/indra/newview/featuretable_solaris.txt @@ -1,4 +1,8 @@ version 15 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable.txt with a few differences // Should be combined into one table diff --git a/indra/newview/featuretable_xp.txt b/indra/newview/featuretable_xp.txt index a0245f5369..a53be10be1 100644 --- a/indra/newview/featuretable_xp.txt +++ b/indra/newview/featuretable_xp.txt @@ -1,4 +1,8 @@ version 31 +// The version number above should be implemented IF AND ONLY IF some +// change has been made that is sufficiently important to justify +// resetting the graphics preferences of all users to the recommended +// defaults. This should be as rare an event as we can manage. // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 18aa14a15c..ab2c5d7ad5 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -377,7 +377,7 @@ bool idle_startup() else if ((gSavedSettings.getS32("LastFeatureVersion") < LLFeatureManager::getInstance()->getVersion()) && (gSavedSettings.getS32("LastFeatureVersion") != 0)) { - LLNotificationsUtil::add("DisplaySetToRecommended"); + LLNotificationsUtil::add("DisplaySetToRecommendedFeatureChange"); } else if ( ! lastGPU.empty() && (lastGPU != thisGPU)) { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1d5f9e731a..03181d79cd 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2674,9 +2674,9 @@ to '[THIS_GPU]' -Display settings have been set to recommended levels based on your system configuration. +Display settings have been set to recommended levels because of a change to the rendering subsystem.