diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 4df2808b3d..e78dd3baf8 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -37,7 +37,6 @@ set(cmake_SOURCE_FILES
FreeType.cmake
GStreamer010Plugin.cmake
GooglePerfTools.cmake
- Growl.cmake
JPEG.cmake
LLAddBuildTest.cmake
LLAudio.cmake
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index bea43f9308..e852cf463c 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -38,8 +38,6 @@ if(WINDOWS)
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
- lgggrowl++.dll
- lgggrowl.dll
)
# *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
@@ -50,8 +48,6 @@ if(WINDOWS)
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
- lgggrowl++.dll
- lgggrowl.dll
)
if(USE_GOOGLE_PERFTOOLS)
@@ -173,7 +169,6 @@ elseif(DARWIN)
libllqtwebkit.dylib
libndofdev.dylib
libexception_handler.dylib
- libgrowl.dylib
)
# fmod is statically linked on darwin
@@ -241,7 +236,6 @@ elseif(LINUX)
libtcmalloc.so
libuuid.so.1
libssl.so.0.9.7
- libnotify.so
)
if (FMOD)
diff --git a/indra/cmake/FindLibnotify.cmake b/indra/cmake/FindLibnotify.cmake
deleted file mode 100644
index 395dac804e..0000000000
--- a/indra/cmake/FindLibnotify.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- cmake -*-
-
-# - Find libnotify
-# Find the libnotify includes and library
-# This module defines
-# LIBNOTIFY_INCLUDE_DIR, where to find notify.h, etc.
-# LIBNOTIFY_LIBRARIES, the libraries needed to use libnotify.
-# LIBNOTIFY_FOUND, If false, do not try to use libnotify.
-# also defined, but not for general use are
-# LIBNOTIFY_LIBRARY, where to find the libnotify library.
-
-FIND_PATH(LIBNOTIFY_INCLUDE_DIR notify.h
- PATH_SUFFIXES libnotify
- )
-
-SET(LIBNOTIFY_NAMES ${LIBNOTIFY_NAMES} notify)
-FIND_LIBRARY(LIBNOTIFY_LIBRARY
- NAMES ${LIBNOTIFY_NAMES}
- )
-
-IF (LIBNOTIFY_LIBRARY AND LIBNOTIFY_INCLUDE_DIR)
- SET(LIBNOTIFY_LIBRARIES ${LIBNOTIFY_LIBRARY})
- SET(LIBNOTIFY_FOUND "YES")
-ELSE (LIBNOTIFY_LIBRARY AND LIBNOTIFY_INCLUDE_DIR)
- SET(LIBNOTIFY_FOUND "NO")
-ENDIF (LIBNOTIFY_LIBRARY AND LIBNOTIFY_INCLUDE_DIR)
-
-
-IF (LIBNOTIFY_FOUND)
- IF (NOT LIBNOTIFY_FIND_QUIETLY)
- MESSAGE(STATUS "Found libnotify: '${LIBNOTIFY_LIBRARIES}' and header in '${LIBNOTIFY_INCLUDE_DIR}'")
- ENDIF (NOT LIBNOTIFY_FIND_QUIETLY)
-ELSE (LIBNOTIFY_FOUND)
- IF (LIBNOTIFY_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find libnotify library")
- ENDIF (LIBNOTIFY_FIND_REQUIRED)
-ENDIF (LIBNOTIFY_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_LIBNOTIFY_INCLUDE_PATH ${LIBNOTIFY_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_LIBNOTIFY_LIB_PATH ${LIBNOTIFY_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
- LIBNOTIFY_LIBRARY
- LIBNOTIFY_INCLUDE_DIR
- )
diff --git a/indra/cmake/Growl.cmake b/indra/cmake/Growl.cmake
deleted file mode 100644
index 7b2c9177d9..0000000000
--- a/indra/cmake/Growl.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- cmake -*-
-
-# Growl is actually libnotify on linux systems.
-if (STANDALONE)
- set(LIBNOTIFY_FIND_REQUIRED ON)
- include(FindLibnotify)
- set(GROWL_INCLUDE_DIRS ${LIBNOTIFY_INCLUDE_DIR})
- set(GROWL_LIBRARY ${LIBNOTIFY_LIBRARIES})
-else (STANDALONE)
- include(Prebuilt)
- use_prebuilt_binary(Growl)
- if (DARWIN)
- set(GROWL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/Growl)
- set(GROWL_LIBRARY growl)
- elseif (WINDOWS)
- set(GROWL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/Growl)
- set(GROWL_LIBRARY lgggrowl++)
- elseif (LINUX)
- # Everything glib-2.0 and GTK-specific is pulled in by UI.cmake.. Ugh.
- set(GROWL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libnotify)
- set(GROWL_LIBRARY notify)
- endif (DARWIN)
-endif (STANDALONE)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f7076d8ed3..c707e4b0a3 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -41,7 +41,6 @@ include(LLKDU)
include(ViewerMiscLibs)
include(LLLogin)
include(CMakeCopyIfDifferent)
-include(Growl)
include_directories(
${DBUSGLIB_INCLUDE_DIRS}
@@ -66,15 +65,12 @@ include_directories(
${LSCRIPT_INCLUDE_DIRS}/lscript_compile
${LLLOGIN_INCLUDE_DIRS}
${UPDATER_INCLUDE_DIRS}
- ${GROWL_INCLUDE_DIRS}
)
set(viewer_SOURCE_FILES
chatbar_as_cmdline.cpp
kcwlinterface.cpp
fscontactsfloater.cpp
- growlmanager.cpp
- growlnotifier.cpp
llagent.cpp
llagentaccess.cpp
llagentcamera.cpp
@@ -620,8 +616,6 @@ set(viewer_HEADER_FILES
chatbar_as_cmdline.h
kcwlinterface.h
fscontactsfloater.h
- growlmanager.h
- growlnotifier.h
llagent.h
llagentaccess.h
llagentcamera.h
@@ -1150,11 +1144,6 @@ source_group("CMake Rules" FILES ViewerInstall.cmake)
if (DARWIN)
LIST(APPEND viewer_SOURCE_FILES llappviewermacosx.cpp)
- LIST(APPEND viewer_HEADER_FILES growlnotifiermacosx-objc.h)
- LIST(APPEND viewer_SOURCE_FILES growlnotifiermacosx-objc.mm)
- LIST(APPEND viewer_SOURCE_FILES growlnotifiermacosx.h)
- LIST(APPEND viewer_SOURCE_FILES growlnotifiermacosx.cpp)
-
find_library(AGL_LIBRARY AGL)
find_library(APPKIT_LIBRARY AppKit)
@@ -1196,8 +1185,6 @@ endif (DARWIN)
if (LINUX)
LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp)
- LIST(APPEND viewer_HEADER_FILES desktopnotifierlinux.h)
- LIST(APPEND viewer_SOURCE_FILES desktopnotifierlinux.cpp)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
set(viewer_LIBRARIES
@@ -1207,13 +1194,11 @@ endif (LINUX)
if (WINDOWS)
list(APPEND viewer_SOURCE_FILES
- growlnotifierwin.cpp
llappviewerwin32.cpp
llwindebug.cpp
)
list(APPEND viewer_HEADER_FILES
- growlnotifierwin.h
llappviewerwin32.h
llwindebug.h
)
@@ -1581,7 +1566,6 @@ if (WINDOWS)
${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qjpcodecsd4.dll
${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qkrcodecsd4.dll
${ARCH_PREBUILT_DIRS_RELEASE}/codecs/qtwcodecsd4.dll
- ${ARCH_PREBUILT_DIRS_RELEASE}/lgggrowl.dll
SLPlugin
media_plugin_quicktime
media_plugin_webkit
@@ -1734,7 +1718,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${CRYPTO_LIBRARIES}
${LLLOGIN_LIBRARIES}
${GOOGLE_PERFTOOLS_LIBRARIES}
- ${GROWL_LIBRARY}
)
if (LINUX OR FIRECYG OR DARWIN)
diff --git a/indra/newview/app_settings/growl_notifications.xml b/indra/newview/app_settings/growl_notifications.xml
deleted file mode 100644
index 276fae7971..0000000000
--- a/indra/newview/app_settings/growl_notifications.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
-
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 104649bd7e..6f2438dc20 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13106,27 +13106,5 @@
Value1
- PhoenixEnableGrowl
-
- PhoenixGrowlWhenActive
-
diff --git a/indra/newview/desktopnotifierlinux.cpp b/indra/newview/desktopnotifierlinux.cpp
deleted file mode 100644
index ee695c5956..0000000000
--- a/indra/newview/desktopnotifierlinux.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Copyright (c) 2010 Discrete Dreamscape All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * 3. Neither the name Discrete Dreamscape nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DISCRETE DREAMSCAPE AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DISCRETE DREAMSCAPE OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "llviewerprecompiledheaders.h"
-#include "desktopnotifierlinux.h"
-
-#include "notify.h"
-
-const char* ICON_128 = "firestorm_icon128.png";
-const char* ICON_512 = "firestorm_icon.png";
-const gint NOTIFICATION_TIMEOUT_MS = 5000;
-
-static const char* icon_wholename;
-
-const char* Find_BMP_Resource(const char *basename)
-{
- const int PATH_BUFFER_SIZE=1000;
- char* path_buffer = new char[PATH_BUFFER_SIZE]; /* Flawfinder: ignore */
-
- // Figure out where our BMP is living on the disk
- snprintf(path_buffer, PATH_BUFFER_SIZE-1, "%s%sres-sdl%s%s",
- gDirUtilp->getAppRODataDir().c_str(),
- gDirUtilp->getDirDelimiter().c_str(),
- gDirUtilp->getDirDelimiter().c_str(),
- basename);
- path_buffer[PATH_BUFFER_SIZE-1] = '\0';
-
- return path_buffer;
-}
-
-DesktopNotifierLinux::DesktopNotifierLinux()
-{
- if (notify_init("Firestorm Viewer")) {
- LL_INFOS("DesktopNotifierLinux") << "Linux desktop notifications initialized." << LL_ENDL;
- // Find the name of our notification server. I kinda don't expect it to change after the start of the program.
- gchar* name = NULL;
- gchar* vendor = NULL;
- gchar* version = NULL;
- gchar* spec = NULL;
- bool info_success = notify_get_server_info(&name, &vendor, &version, &spec);
- if (info_success) {
- LL_INFOS("DesktopNotifierLinux") << "Server name: " << name << LL_ENDL;
- LL_INFOS("DesktopNotifierLinux") << "Server vendor: " << vendor << LL_ENDL;
- LL_INFOS("DesktopNotifierLinux") << "Server version: " << version << LL_ENDL;
- LL_INFOS("DesktopNotifierLinux") << "Server spec: " << spec << LL_ENDL;
- }
- if (!info_success || strncmp("notification-daemon", name, 19)) {
- // We're likely talking to notification-daemon, and I don't feel like scaling. Use a premade 128x128 icon.
- icon_wholename = Find_BMP_Resource(ICON_128);
- } else {
- // Talking to NotifyOSD or something else. Try the 512x512 icon and let it scale on its own.
- icon_wholename = Find_BMP_Resource(ICON_512);
- }
- LL_INFOS("DesktopNotifierLinux") << "Linux desktop notification icon: " << icon_wholename << LL_ENDL;
- } else {
- LL_WARNS("DesktopNotifierLinux") << "Linux desktop notifications FAILED to initialize." << LL_ENDL;
- }
-}
-
-void DesktopNotifierLinux::showNotification(const std::string& notification_title, const std::string& notification_message, const std::string& notification_type)
-{
- LL_INFOS("DesktopNotifierLinux") << "New notification title: " << notification_title << LL_ENDL;
- LL_INFOS("DesktopNotifierLinux") << "New notification message: " << notification_message << LL_ENDL;
- LL_INFOS("DesktopNotifierLinux") << "New notification type: " << notification_type << LL_ENDL;
-
- static NotifyNotification* notification = notify_notification_new(
- "Firestorm Viewer",//(gchar*)notification_title.c_str(),
- NULL,//(gchar*)notification_message.c_str(),
- icon_wholename,
- NULL
- );
-
- notify_notification_update(
- notification,
- (gchar*)notification_title.c_str(),
- (gchar*)notification_message.c_str(),
- icon_wholename
- );
-
- notify_notification_set_urgency(notification, NOTIFY_URGENCY_LOW);
- notify_notification_set_category(notification, (gchar*)notification_type.c_str());
- notify_notification_set_timeout(notification, NOTIFICATION_TIMEOUT_MS); // NotifyOSD ignores this, sadly.
-
- GError* error = NULL;
- if (notify_notification_show(notification, &error)) {
- LL_INFOS("DesktopNotifierLinux") << "Linux desktop notification type " << notification_type << "sent." << LL_ENDL;
- } else {
- LL_WARNS("DesktopNotifierLinux") << "Linux desktop notification FAILED to send. " << error->message << LL_ENDL;
- }
-}
-
-bool DesktopNotifierLinux::isUsable()
-{
- return notify_is_initted();
-}
-
-/*void DesktopNotifierLinux::registerApplication(const std::string& application, const std::set& notificationTypes)
-{
- // Do nothing for now.
-}*/
-
-bool DesktopNotifierLinux::needsThrottle()
-{
- return false; // NotifyOSD seems to have no issues with handling spam.. How about notification-daemon?
-}
diff --git a/indra/newview/desktopnotifierlinux.h b/indra/newview/desktopnotifierlinux.h
deleted file mode 100644
index 8bd0c06f31..0000000000
--- a/indra/newview/desktopnotifierlinux.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright (c) 2010 Discrete Dreamscape All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * 3. Neither the name Discrete Dreamscape nor the names of its contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DISCRETE DREAMSCAPE AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DISCRETE DREAMSCAPE OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DESKTOPNOTIFIERLINUX_H
-#define DESKTOPNOTIFIERLINUX_H
-
-#include
-#include "growlnotifier.h"
-
-class DesktopNotifierLinux : public GrowlNotifier
-{
- LOG_CLASS(DesktopNotifierLinux);
-public:
- DesktopNotifierLinux();
- ~DesktopNotifierLinux(){}
-
- void showNotification(const std::string& notification_title, const std::string& notification_message, const std::string& notificationTypes);
- bool isUsable();
- //void registerApplication(const std::string& application, const std::set& notificationTypes);
- bool needsThrottle();
-};
-
-#endif // DESKTOPNOTIFIERLINUX_H
diff --git a/indra/newview/growlmanager.cpp b/indra/newview/growlmanager.cpp
deleted file mode 100644
index 209321810e..0000000000
--- a/indra/newview/growlmanager.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/* Copyright (c) 2010 Katharine Berry All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * 3. Neither the name Katharine Berry nor the names of any contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY KATHARINE BERRY AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KATHARINE BERRY OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "lldir.h"
-#include "llfile.h"
-#include "llnotifications.h"
-#include "llsd.h"
-#include "llsdserialize.h"
-#include "llstartup.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-
-#include "growlmanager.h"
-#include "growlnotifier.h"
-#include "llwindow.h"
-#include "llfocusmgr.h"
-
-// Platform-specific includes
-#ifdef LL_DARWIN
-#include "growlnotifiermacosx.h"
-#elif LL_WINDOWS
-#include "growlnotifierwin.h"
-#elif LL_LINUX
-#include "desktopnotifierlinux.h"
-#endif
-
-
-GrowlManager *gGrowlManager = NULL;
-
-GrowlManager::GrowlManager() : LLEventTimer(GROWL_THROTTLE_CLEANUP_PERIOD)
-{
- // Create a notifier appropriate to the platform.
-#ifdef LL_DARWIN
- this->mNotifier = new GrowlNotifierMacOSX();
- LL_INFOS("GrowlManagerInit") << "Created GrowlNotifierMacOSX." << LL_ENDL;
-#elif LL_WINDOWS
- this->mNotifier = new GrowlNotifierWin();
- LL_INFOS("GrowlManagerInit") << "Created GrowlNotifierWin." << LL_ENDL;
-#elif LL_LINUX
- this->mNotifier = new DesktopNotifierLinux();
- LL_INFOS("GrowlManagerInit") << "Created DesktopNotifierLinux." << LL_ENDL;
-#else
- this->mNotifier = new GrowlNotifier();
- LL_INFOS("GrowlManagerInit") << "Created generic GrowlNotifier." << LL_ENDL;
-#endif
-
- // Don't do anything more if Growl isn't usable.
- if(!mNotifier->isUsable())
- {
- LL_WARNS("GrowlManagerInit") << "Growl is unusable; bailing out." << LL_ENDL;
- return;
- }
-
- // Hook into LLNotifications...
- // We hook into all of them, even though (at the time of writing) nothing uses "alert", so more notifications can be added easily.
- LLNotificationChannel::buildChannel("GrowlNotifications", "Visible", LLNotificationFilters::includeEverything);
-
- LLNotifications::instance().getChannel("GrowlNotifications")->connectChanged(&GrowlManager::onLLNotification);
- this->loadConfig();
-}
-
-void GrowlManager::loadConfig()
-{
- std::string config_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "growl_notifications.xml");
- if(config_file == "")
- {
- LL_WARNS("GrowlConfig") << "Couldn't find growl_notifications.xml" << LL_ENDL;
- return;
- }
- LL_INFOS("GrowlConfig") << "Loading growl notification config from " << config_file << LL_ENDL;
- llifstream configs(config_file);
- LLSD notificationLLSD;
- std::set notificationTypes;
- notificationTypes.insert("Keyword Alert");
- notificationTypes.insert("Instant Message received");
- if(configs.is_open())
- {
- LLSDSerialize::fromXML(notificationLLSD, configs);
- for(LLSD::map_iterator itr = notificationLLSD.beginMap(); itr != notificationLLSD.endMap(); ++itr)
- {
- GrowlNotification ntype;
- ntype.growlName = itr->second.get("GrowlName").asString();
- notificationTypes.insert(ntype.growlName);
-
- if(itr->second.has("GrowlTitle"))
- ntype.growlTitle = itr->second.get("GrowlTitle").asString();
- if(itr->second.has("GrowlBody"))
- ntype.growlBody = itr->second.get("GrowlBody").asString();
- if(itr->second.has("UseDefaultTextForTitle"))
- ntype.useDefaultTextForTitle = itr->second.get("UseDefaultTextForTitle").asBoolean();
- else
- ntype.useDefaultTextForTitle = false;
- if(itr->second.has("UseDefaultTextForBody"))
- ntype.useDefaultTextForBody = itr->second.get("UseDefaultTextForBody").asBoolean();
- else
- ntype.useDefaultTextForBody = false;
- if(ntype.useDefaultTextForBody == false && ntype.useDefaultTextForTitle == false &&
- ntype.growlBody == "" && ntype.growlTitle == "")
- {
- ntype.useDefaultTextForBody = true;
- }
- this->mNotifications[itr->first] = ntype;
- }
- configs.close();
-
- this->mNotifier->registerApplication("Firestorm Viewer", notificationTypes);
- }
- else
- {
- LL_WARNS("GrowlConfig") << "Couldn't open growl config file." << LL_ENDL;
- }
-
-}
-
-void GrowlManager::notify(const std::string& notification_title, const std::string& notification_message, const std::string& notification_type)
-{
- static LLCachedControl enabled(gSavedSettings, "PhoenixEnableGrowl");
- if(!enabled)
- return;
-
- if(!shouldNotify())
- return;
-
- if(this->mNotifier->needsThrottle())
- {
- U64 now = LLTimer::getTotalTime();
- if(mTitleTimers.find(notification_title) != mTitleTimers.end())
- {
- if(mTitleTimers[notification_title] > now - GROWL_THROTTLE_TIME)
- {
- LL_WARNS("GrowlNotify") << "Discarded notification with title '" << notification_title << "' - spam ._." << LL_ENDL;
- mTitleTimers[notification_title] = now;
- return;
- }
- }
- mTitleTimers[notification_title] = now;
- }
- this->mNotifier->showNotification(notification_title, notification_message.substr(0, GROWL_MAX_BODY_LENGTH), notification_type);
-}
-
-BOOL GrowlManager::tick()
-{
- mTitleTimers.clear();
- return false;
-}
-
-bool GrowlManager::onLLNotification(const LLSD& notice)
-{
- if(notice["sigtype"].asString() != "add")
- return false;
- static LLCachedControl enabled(gSavedSettings, "PhoenixEnableGrowl");
- if(!enabled)
- return false;
- if(!shouldNotify())
- return false;
- LLNotificationPtr notification = LLNotifications::instance().find(notice["id"].asUUID());
- std::string name = notification->getName();
- LLSD substitutions = notification->getSubstitutions();
- if(LLStartUp::getStartupState() < STATE_STARTED)
- {
- LL_WARNS("GrowlLLNotification") << "GrowlManager discarded a notification (" << name << ") - too early." << LL_ENDL;
- return false;
- }
- if(gGrowlManager->mNotifications.find(name) != gGrowlManager->mNotifications.end())
- {
- GrowlNotification* growl_notification = &gGrowlManager->mNotifications[name];
- std::string body = "";
- std::string title = "";
- if(growl_notification->useDefaultTextForTitle)
- title = notification->getMessage();
- else if(growl_notification->growlTitle != "")
- {
- LLStringUtil::format(growl_notification->growlTitle, substitutions);
- title = growl_notification->growlTitle;
- }
- if(growl_notification->useDefaultTextForBody)
- body = notification->getMessage();
- else if(growl_notification->growlBody != "")
- {
- LLStringUtil::format(growl_notification->growlBody, substitutions);
- body = growl_notification->growlBody;
- }
- LL_INFOS("GrowlLLNotification") << "Notice: " << title << ": " << body << LL_ENDL;
- gGrowlManager->notify(title, body, growl_notification->growlName);
- }
- return false;
-}
-
-bool GrowlManager::shouldNotify()
-{
- // This magic stolen from llappviewer.cpp. LLViewerWindow::getActive lies.
- static LLCachedControl activated(gSavedSettings, "PhoenixGrowlWhenActive");
- return (activated || (!gViewerWindow->mWindow->getVisible() || !gFocusMgr.getAppHasFocus()));
-}
-
-void GrowlManager::InitiateManager()
-{
- gGrowlManager = new GrowlManager();
-}
-
diff --git a/indra/newview/growlmanager.h b/indra/newview/growlmanager.h
deleted file mode 100644
index 14ebea5b73..0000000000
--- a/indra/newview/growlmanager.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (c) 2010 Katharine Berry All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * 3. Neither the name Katharine Berry nor the names of any contributors
- * may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY KATHARINE BERRY AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KATHARINE BERRY OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GROWLMANAGER_H
-#define GROWLMANAGER_H
-#include "growlnotifier.h"
-#include "lleventtimer.h"
-#include