Commit Graph

47 Commits (beb3ff3d36b00aada54682551062d790411c5a64)

Author SHA1 Message Date
Ansariel 8c4c9fbe96 Put everything in FSCommon into the namespace with the same name 2024-09-06 14:29:02 +02:00
Ansariel 0ecfbc3de9 Merge remote-tracking branch 'LGPL/master'
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llappearance/llwearable.cpp
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llgroupactions.cpp
#	indra/newview/llimpanel.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
2024-05-16 14:10:55 +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 9a044f4a52 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llappearance/llavatarappearance.cpp
#	indra/llappearance/llavatarappearance.h
#	indra/llappearance/lldriverparam.h
#	indra/llappearance/llviewervisualparam.cpp
#	indra/llaudio/llaudiodecodemgr.cpp
#	indra/llcharacter/llcharacter.cpp
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llpanelnearbymedia.cpp
#	indra/newview/llpanelnearbymedia.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
2024-02-13 00:54:24 +01:00
Ansariel 14ae6fb37c FIRE-13930: Show Growl notification when receiving TP offers/requests 2018-06-10 02:36:29 +02:00
Ansariel f2a22123b0 Add fast timer for growl notifications for diagnostics 2018-06-03 13:49:25 +02:00
Ansariel 50afc63c64 Don't notify via Growl if viewer is shutting down 2018-01-21 15:30:22 +01:00
Ansariel fa17c14cbb Filter out announcement type IMs (incoming IMs, autoresponse sent...) from Growl - the important message might not be shown due to message throttle otherwise 2016-04-24 00:35:34 +02:00
Ansariel ca31237cd6 Growl shouldn't notify if DnD mode is set 2015-12-01 22:48:37 +01:00
Ansariel addeaede43 GrowlManager: Only query avatar name cache if the chat actually came from an avatar 2015-11-22 17:17:16 +01:00
Ansariel 2a5bd3015a Consolidate IRC /me prefix checks that are cluttered all over the place 2015-11-14 00:20:32 +01:00
Ansariel 8aaf4bb1fe Growl finally arrived in 2015 and can now handle display names as well! 2015-11-13 14:54:09 +01:00
Ansariel 500cbd17a5 FIRE-17187: Fix message with URL containing custom label ([url description]) shows description twice in console and fix wrong start and end indices for LLWString URL matches on the way 2015-11-02 11:02:00 +01:00
Ansariel 67fceb3ef8 Small round of clean up:
* Remove unused includes
* Fix a case of improper declared method
* Fixed a few cases of variable redefintions
2015-05-09 12:20:04 +02:00
Nicky 217e879c20 Linux: fstream has no constructor that takes a std::string. 2015-05-06 16:34:41 +02:00
Ansariel 1eb9a36618 Add FSFilterGrowlKeywordDuplicateIMs debug setting in case somebody wants to filter duplicate IMs in Growl caused by keyword alert 2015-03-17 01:18:21 +01:00
Ansariel ee4d2c9947 More refactoring of GrowlManager 2015-03-11 14:00:44 +01:00
Ansariel 3722d01195 Hide internal Growl implementation behind static facade for covenience 2015-03-11 13:48:10 +01:00
Ansariel e97f84e504 Move null check directly to GrowlManager::notify() to be safe for future changes 2015-03-10 21:53:31 +01:00
Ansariel 17ef6bf3cd Properly release Growl during viewer shutdown 2015-03-07 00:44:25 +01:00
Ansariel 2e0a7fd873 Prepare LLIMModel and LLIMMgr to pass through info if we already performed a keyword alert so we can filter out basically duplicate notifications in Growl if it will be requested 2015-03-06 23:53:20 +01:00
Ansariel 1462f7b70e Get rid of Growl notifications for object IMs in LLViewerChat::getChatColor() - this gets called up to 3 times per chat message! 2015-03-06 15:32:04 +01:00
Ansariel 4e03057287 Clean up GrowlManager and protect various callbacks 2014-09-08 00:35:47 +02:00
Ansariel 304c3bf191 Change severity of Growl unavailable log message to info 2014-08-12 12:59:33 +02:00
Cinders 9d1b59edf5 Messy transition from growl framework to gntp-growl on darwin. Will clean it up later. 2013-12-06 19:56:47 -07:00
Cinders 9b2e7ddd25 Fix missing EOF newlines 2013-07-28 14:38:09 -06:00
Ansariel 2ebf117d80 More fixes for Growl 2013-06-29 02:13:25 +02:00
Ansariel 4220907e1f Proposed fix for Growl 2013-06-29 02:02:00 +02:00
Ansariel 92299fb5cc Remove Growl warning in preferences and instead enable Growl checkboxes only if Growl is usable since we can check status on all platforms now 2013-04-29 11:46:07 +02: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
Ansariel ec98491dfb Add Growl support for OwnObjectGiveItem notification 2013-04-19 23:44:01 +02:00
Ansariel e7c3db2715 FIRE-550: Display dialog messages with Growl 2013-04-19 23:35:37 +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
Tonya Souther 28e7158b99 FIRE-6339: Add Growl support on OS X. Adapted from a patch by Nagi Michinaga. 2012-05-25 22:47:18 -05:00
Tank_Master 12b93bd75b Dont log messages sent to growl 2012-05-24 11:23:40 -07:00
Nicky 1c2674d552 Enable libnotify (desktop notifications) for Linux. 2012-03-21 21:43:41 +01:00
Ansariel d8c7dfd223 Crashfix in chat console and Growl (INT-77) 2012-03-11 01:54:06 +01:00
Ansariel 288fcbc360 Parse also SystemMessageTip notifications for Growl - may contain TP successful notifications with SLURLs 2012-02-28 18:03:11 +01:00
Liny a0075abd74 Cleaning up growl sending notices before being fully logged on, prevents growl from triggering on keyword's from chatlog loading.
Fixing growl from showing the SLURL of the owner of inventory offers instead of the correct username.
2012-02-22 13:45:53 -08:00
Liny 44c296c448 Merging in latest changes for growl. 2012-02-22 13:35:33 -08:00
Liny 1158d4416f Fixing growl from over-writing its layout info for formating of its notices.
--HG--
branch : growl
2011-10-14 18:17:58 -07:00
Liny 0bd9533286 Fixing growl from reporting all IMs, making it only report direct IMs.
--HG--
branch : growl
2011-10-11 14:50:08 -07:00
Liny 0f2ff9717c Following Wolf's lead and renaming settings from Phoenix* to FS*
--HG--
branch : growl
2011-10-11 10:11:49 -07:00
Liny 4e84334114 Disabling growl on non windows platforms
--HG--
branch : growl
2011-10-09 13:20:21 -07:00
Liny 80a7b68e91 Attempt at getting growl working on mac osx (changes from c119f1cd1a)
--HG--
branch : growl
2011-02-15 14:14:00 -08:00
Liny ec13a029e8 branch for growl.
--HG--
branch : growl
2011-02-02 14:30:09 -08:00