diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index b5eafaf398..662d6afefa 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -212,10 +212,6 @@ bool callback_clear_debug_search(const LLSD& notification, const LLSD& response) bool callback_pick_debug_search(const LLSD& notification, const LLSD& response); // -#ifdef LL_WINDOWS -bool callback_growl_not_installed(const LLSD& notification, const LLSD& response); -#endif - //bool callback_skip_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater); //bool callback_reset_dialogs(const LLSD& notification, const LLSD& response, LLFloaterPreference* floater); @@ -234,19 +230,6 @@ bool callback_clear_cache(const LLSD& notification, const LLSD& response) return false; } -#ifdef LL_WINDOWS -bool callback_growl_not_installed(const LLSD& notification, const LLSD& response) -{ - S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - if ( option == 1 ) // NO - { - gSavedSettings.setBOOL("FSEnableGrowl", FALSE); - } - - return false; -} -#endif - bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response) { S32 option = LLNotificationsUtil::getSelectedOption(notification, response); @@ -2201,12 +2184,6 @@ BOOL LLPanelPreference::postBuild() { getChildView("OnlineOfflinetoNearbyChatHistory")->setEnabled(getChild("OnlineOfflinetoNearbyChat")->getValue().asBoolean()); } -#ifdef LL_WINDOWS - if (hasChild("notify_growl_checkbox", TRUE)) - { - getChild("notify_growl_checkbox")->setCommitCallback(boost::bind(&showGrowlNotInstalledWarning, _1, _2)); - } -#endif #ifdef HAS_OPENSIM_SUPPORT // // if(LLGridManager::getInstance()->isInOpenSim() && hasChild("UseLSLBridge", TRUE)) @@ -2301,16 +2278,6 @@ void LLPanelPreference::showFavoritesOnLoginWarning(LLUICtrl* checkbox, const LL } } -#ifdef LL_WINDOWS -void LLPanelPreference::showGrowlNotInstalledWarning(LLUICtrl* checkbox, const LLSD& value) -{ - if (checkbox && checkbox->getValue()) - { - LLNotificationsUtil::add("GrowlNotInstalled",LLSD(), LLSD(), callback_growl_not_installed); - } -} -#endif - void LLPanelPreference::cancel() { for (control_values_map_t::iterator iter = mSavedValues.begin(); diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 541c27268b..ab391d7be3 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -245,10 +245,6 @@ private: //for "Show my Favorite Landmarks at Login" static void showFavoritesOnLoginWarning(LLUICtrl* checkbox, const LLSD& value); -#ifdef LL_WINDOWS - static void showGrowlNotInstalledWarning(LLUICtrl* checkbox, const LLSD& value); -#endif - typedef std::map string_color_map_t; string_color_map_t mSavedColors; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 2fd6aed5e0..5ed0a4364a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -369,19 +369,6 @@ Save all changes to clothing/body parts? yestext="OK"/> - - WARNING: Enabling this option without having growl installed will result in small freezes when someone messages you or goes on/offline. -Read http://wiki.phoenixviewer.com/fs_growl for more information. -Do you stil wish to enable it? - - -