From 47c3446bb4efbef7294e934a8fef7eb753ae48dd Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Mon, 9 Mar 2015 13:46:10 +0100
Subject: [PATCH] New growl libraries, now with 100% more log output
 capabilities.

---
 autobuild.xml                      |  4 ++--
 indra/newview/growlnotifierwin.cpp | 16 ++++++++++++++++
 package_override.ini               |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 4f94977d32..deb9109c4c 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -100,9 +100,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b798091dc539032d66e010274e9050c3</string>
+              <string>ad4d439bfd9e8768ba0d99e10087b333</string>
               <key>url</key>
-              <uri>http://downloads.phoenixviewer.com/gntp_growl-1.0-windows-20130425.tar.bz2</uri>
+              <uri>http://downloads.phoenixviewer.com/gntp_growl-1.0-windows-201503091206-r9d.tar.bz2</uri>
             </map>
           </map>
         </map>
diff --git a/indra/newview/growlnotifierwin.cpp b/indra/newview/growlnotifierwin.cpp
index 103aea3bde..f743f41fc3 100644
--- a/indra/newview/growlnotifierwin.cpp
+++ b/indra/newview/growlnotifierwin.cpp
@@ -36,11 +36,27 @@
 #include "llviewerprecompiledheaders.h"
 #include "growlnotifierwin.h"
 
+#include "growl.h"
+#include "llviewercontrol.h"
+
+#ifdef GROWL_HAS_LOG
+#pragma comment(lib,"growl.lib")
+void __cdecl GrowlLogSink( char const *aMessage, int aLevel )
+{
+	LL_INFOS( "Growl" ) << aMessage << LL_ENDL;
+}
+#endif
+
 GrowlNotifierWin::GrowlNotifierWin() :
 	mApplicationName(""),
 	mGrowlImpl(NULL)
 {
 	LL_INFOS("GrowlNotifierWin") << "Windows growl notifier initialized." << LL_ENDL;
+
+#ifdef GROWL_HAS_LOG
+	if( gSavedSettings.controlExists( "FSGrowlLog" ) && gSavedSettings.getBOOL( "FSGrowlLog" ) )
+		growl_set_log_sink( GrowlLogSink );
+#endif
 }
 
 GrowlNotifierWin::~GrowlNotifierWin()
diff --git a/package_override.ini b/package_override.ini
index b020805ae1..4d50bbeb5e 100644
--- a/package_override.ini
+++ b/package_override.ini
@@ -81,7 +81,7 @@ windows = http://downloads.phoenixviewer.com/nvapi-304-windows-x64-20130802.tar.
 windows = http://downloads.phoenixviewer.com/google_breakpad-0.0.0-rev1099-windows-x64-20140519.tar.bz2|cacec8bb94bd2708871ccbbef9395442
 
 [growl]
-windows = http://downloads.phoenixviewer.com/gntp_growl-1.0-windows-x64-20130802.tar.bz2|e10481fb350646db17597728b6e23fa5
+windows = http://downloads.phoenixviewer.com/gntp_growl-1.0-windows-x64-201503091205-r9d.tar.bz2|a2166e42eac73bf0b5703f2cce47556b
 
 [slplugin_x86]
 windows = http://downloads.phoenixviewer.com/slplugin_x86-1.2-windows-20141023.tar.bz2|c9fea1399b836323d9379e022f13e488