Commit Graph

14 Commits (c270ededd1f25f3724fda2e4b2dcfcd2a5fa103e)

Author SHA1 Message Date
Ansariel a17fd2352a Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/llcharacter/llmotioncontroller.cpp
#	indra/llcrashlogger/llcrashlogger.cpp
#	indra/llimage/llimagetga.cpp
#	indra/llmessage/llregionflags.h
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/llmodel.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/llui/llconsole.cpp
#	indra/llui/llkeywords.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/lltextbase.cpp
#	indra/llui/lltexteditor.cpp
#	indra/llui/llurlentry.cpp
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llgiveinventory.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelteleporthistory.cpp
#	indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
Ansariel 5f1a19af72 Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
#	autobuild.xml
#	indra/linux_crash_logger/llcrashloggerlinux.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
Ansariel 2b6d9801bb Remove obsolete HAS_GROWL compile definition 2023-04-06 12:40:16 +02:00
Tonya Souther 2e644b4911 Compile fixes for Xcode 9 (and probably gcc). 2018-01-27 02:02:16 -06:00
Nicky 5e639c907d Allow to compile w/o growl. 2015-05-05 16:23:51 +02:00
Nicky 47c3446bb4 New growl libraries, now with 100% more log output capabilities. 2015-03-09 13:46:10 +01:00
Ansariel 17ef6bf3cd Properly release Growl during viewer shutdown 2015-03-07 00:44:25 +01:00
Ansariel bb00dcdd97 Code cleanup in GrowlNotifierWin 2015-03-06 23:58:02 +01:00
Ansariel 849fd38197 Some Growl related cleanup 2013-04-29 09:53:36 +02:00
Ansariel 7532d4f953 FIRE-6868: Implemented GrowlNotifierWin::isUsable and fixed Growl initialization on Windows (only subscribe for events if Growl is available) 2013-04-26 22:40:12 +02:00
Tank_Master f2a9376865 Add file name into copyright info on growl files and disable logging growl messages on Linux 2012-06-30 09:08:47 -07:00
Liny 44c296c448 Merging in latest changes for growl. 2012-02-22 13:35:33 -08:00
Liny 418c9f47e5 Possible crash fix for growl instilization.
--HG--
branch : growl
2011-10-22 15:04:54 -07:00
Liny ec13a029e8 branch for growl.
--HG--
branch : growl
2011-02-02 14:30:09 -08:00