livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Following Wolf's lead and renaming settings from Phoenix* to FS* 

--HG--
branch : growl
meow-7.2.2
Liny 2011-10-11 10:11:49 -07:00
parent cee0febfca
commit 0f2ff9717c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/settings.xml
View File

@ -16556,7 +16556,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>PhoenixEnableGrowl</key>
<key>FSEnableGrowl</key>
<map>
<key>Comment</key>
<string>Enables Growl notifications</string>
@ -16567,7 +16567,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>PhoenixGrowlWhenActive</key>
<key>FSGrowlWhenActive</key>
<map>
<key>Comment</key>
<string>If Growl notifications are active, show them even when the window is active.</string>

6
indra/newview/growlmanager.cpp
View File

@ -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<bool> enabled(gSavedSettings, "PhoenixEnableGrowl");
static LLCachedControl<bool> 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<bool> enabled(gSavedSettings, "PhoenixEnableGrowl");
static LLCachedControl<bool> 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<bool> activated(gSavedSettings, "PhoenixGrowlWhenActive");
static LLCachedControl<bool> activated(gSavedSettings, "FSGrowlWhenActive");
return (activated || (!gViewerWindow->mWindow->getVisible() || !gFocusMgr.getAppHasFocus()));
}