diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d94e377e77..e3d1063367 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16556,7 +16556,7 @@ Change of this parameter will affect the layout of buttons in notification toast Value 0 - PhoenixEnableGrowl + FSEnableGrowl Comment Enables Growl notifications @@ -16567,7 +16567,7 @@ Change of this parameter will affect the layout of buttons in notification toast Value 1 - PhoenixGrowlWhenActive + FSGrowlWhenActive Comment If Growl notifications are active, show them even when the window is active. diff --git a/indra/newview/growlmanager.cpp b/indra/newview/growlmanager.cpp index 831d31ae9a..90db597039 100644 --- a/indra/newview/growlmanager.cpp +++ b/indra/newview/growlmanager.cpp @@ -147,7 +147,7 @@ void GrowlManager::loadConfig() void GrowlManager::notify(const std::string& notification_title, const std::string& notification_message, const std::string& notification_type) { - static LLCachedControl enabled(gSavedSettings, "PhoenixEnableGrowl"); + static LLCachedControl enabled(gSavedSettings, "FSEnableGrowl"); if(!enabled) return; @@ -181,7 +181,7 @@ bool GrowlManager::onLLNotification(const LLSD& notice) { if(notice["sigtype"].asString() != "add") return false; - static LLCachedControl enabled(gSavedSettings, "PhoenixEnableGrowl"); + static LLCachedControl enabled(gSavedSettings, "FSEnableGrowl"); if(!enabled) return false; if(!shouldNotify()) @@ -244,7 +244,7 @@ void GrowlManager::onInstantMessage(const LLSD& im) bool GrowlManager::shouldNotify() { // This magic stolen from llappviewer.cpp. LLViewerWindow::getActive lies. - static LLCachedControl activated(gSavedSettings, "PhoenixGrowlWhenActive"); + static LLCachedControl activated(gSavedSettings, "FSGrowlWhenActive"); return (activated || (!gViewerWindow->mWindow->getVisible() || !gFocusMgr.getAppHasFocus())); }