Commit Graph

136 Commits (77b6a6e97831399a359bcf8d6195a63c9a2283c8)

Author SHA1 Message Date
Ansariel 86253a8d8a Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/lllogchat.cpp
2023-02-14 23:23:36 +01:00
simon f257ee7d3c SL-18268 - Viewer update to read group chat history.
Feature described at https://community.secondlife.com/blogs/entry/12652-coming-soon-to-a-viewer-near-you-group-chat-history/
2023-02-13 15:19:27 -08:00
Ansariel ae93dd240d Revert "FIRE-11339: Persisted group notifications get logged to IM on each login"
This reverts commit 5609fdbf3d.
2021-08-24 10:54:16 +02:00
Ansariel e4f0270887 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 11:41:48 +01:00
Beq 49039e66ea Avoid AvNameCache log spam for NULL UUID 2021-02-07 17:20:15 +00:00
Ansariel daec926a54 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-11-12 17:02:25 +01:00
Ansariel 5609fdbf3d FIRE-11339: Persisted group notifications get logged to IM on each login 2020-10-29 17:46:28 +01:00
Ansariel 240757c0d0 Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-20 16:52:04 +02:00
Ansariel b076811684 FIRE-29911: Group notices logging to wrong file 2020-07-26 17:57:19 +02:00
Mnikolenko Productengine 48a4e9f5ed SL-13620 FIXED The code appears instead of the maturity icon in the chat history 2020-07-22 19:15:28 +03:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
andreykproductengine 779b5627c5 DRTVWR-493 LLAvatarNameCache to singletone 2019-07-03 20:06:47 +03:00
Ansariel 099d988fe2 Merge viewer-neko 2017-05-25 22:49:53 +02:00
Mnikolenko Productengine b4e5435217 MAINT-7434 FIXED SLURL instead of username appears in "have said something new" text for some messages 2017-05-24 11:06:21 +03:00
Ansariel bff6a3af15 Merge viewer-neko 2017-02-23 09:02:58 +01:00
andreykproductengine 605160d501 MAINT-7118 Swapping legacy people API with new cache 2017-02-15 20:40:03 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Ansariel 9036ed275a FIRE-2436: Change behavior of chat console: Chat console will now always show the chat for sessions that are currently not shown by a visible floater 2015-11-11 13:55:23 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Northspring 19ac039501 FIRE-10940: Added option to suppress group notice text in group chat
Also, exposing Kadah's FSBetterGroupNoticesToIMLog in Prefs
2014-01-16 22:48:36 +01:00
maksymsproductengine 40762b7643 MAINT-3110 FIXED new crash in LLNotificationsUI::LLHandlerUtil::logToIMP2P 2013-09-06 20:16:52 +03:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Tank_Master 3f481c13b1 Add some includes to get the rest of the viewer to compile 2013-11-11 08:05:53 -08:00
Tank_Master e41ca4b4b8 merge RLVa update 2013-11-11 00:40:45 -08:00
Kitty Barnett 7dd730473b Merged with default tip (Revision 35f1667645bc)
--HG--
branch : RLVa
2013-10-09 22:49:44 +02:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Kitty Barnett 10a289598b Merged with default tip (Revision 74cc289067c8)
--HG--
branch : RLVa
2013-07-21 22:33:04 +02:00
Kitty Barnett 45afaf7156 - internal : comment out dead code that would start an IM session
--HG--
branch : RLVa
2013-05-10 13:46:19 +02:00
Ansariel 49ad5109ca Undid outdated chat logs patch from Catznip 2.4 to fix broken chat log filenames and replaced it with stock V3 code plus option to use legacy filenames 2013-07-17 01:47:53 +02:00
Tank_Master 8146bbda39 Merge 2013-07-09 16:26:07 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Ansariel c0450ad230 More code cleanup 2013-07-08 17:23:17 +02:00
Ansariel 32292a2731 FS communication UI: Re-added code so we don't toast IMs if the corresponding floater is open 2013-06-29 20:26:46 +02:00
Ansariel ae6d93f759 FS communication UI: Fixing notification handlers 2013-06-29 04:13:30 +02:00
Ansariel a8cbee6e81 More compile fixes and hooking up of FS communication UI 2013-06-28 23:34:21 +02:00
Tank_Master c61db3d380 Merge LGPL tip 2013-06-26 12:59:37 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Kadah_Coba b9028b5a2e Improved logging of group notices to group IM log 2013-06-06 13:54:16 -07:00
William Todd Stinson 9da625d439 CHUI-494: WIP First pass at getting the suppression of events in DND working. 2012-12-06 20:28:25 -08:00
AlexanderP ProductEngine 486bdf3284 CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00
Gilbert Gonzales 23d58c0c09 CHUI-433: Implemented an alternate solution to the problem. The original solution was ambiguous and incomplete and also preserved an existing hack. The new solution removes a hack/deprecated code (setActiveSession/getActiveSession functions). Basically, a toast message is not displayed if the user already has the conversation in focus. When the conversation floater loses focus toasts message will be displayed for that conversation. 2012-10-22 17:31:51 -07:00
Kelly Washington c6a5b62152 MAINT-994 Oskar Linden login issues
* Set max persistent notifications to 250
* Don't register for notification callbacks until after peristent ones are loaded.
reviewed with Simon
2012-09-26 14:40:16 -07:00
AlexanderP ProductEngine d9309bd163 CHUI-323 FIXED (Local chat message panel out of position in Conversation floater):
Prevented too early creation LLNearbyChat
2012-09-07 12:34:21 +03:00
AlexanderP ProductEngine ae2e611dfb CHUI-315 (Nearby chat messages do not appear in conversation floater): cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it. 2012-08-31 16:52:50 +03:00
AlexanderP ProductEngine 14708a3ace CHUI_310 make NearbyChat a singletone 2012-08-22 18:27:29 +03:00
Ansariel fc9f1252e1 Merge with Firestorm LGPL tip 2013-03-19 09:51:23 +01:00