Commit Graph

753 Commits (c4e18fbcaab2413d153ec79356930bf667839b4f)

Author SHA1 Message Date
Ansariel d8e5d80cf0 FIRE-21807: Playing sound for incoming IMs doesn't play anymore. Also play the correct sound as previously the sound for a new IM session has been used and not the one for an incoming voice call 2017-11-07 20:32:50 +01:00
Ansariel e181912a81 Add NULL checks 2017-10-12 10:10:50 +02:00
Ansariel 7c97b96d5d Merge viewer-neko 2017-08-30 20:00:53 +02:00
Mnikolenko Productengine bcb3bea0a9 MAINT-7760 FIXED Crash in LLViewerChatterBoxInvitation::post(..) 2017-08-30 16:49:52 +03:00
Beq e62a394490 FIRE-21385 Add username as a hyperlink to the rejection notice in local chat 2017-07-09 01:32:43 +01:00
Ansariel dcac0dce59 Merge viewer-bear 2017-05-07 13:11:50 +02:00
Ansariel 95fcf065c1 Merge viewer-bear 2017-04-19 21:43:58 +02:00
Mnikolenko Productengine a48da20140 MAINT-7340 FIXED Incoming IMs steal focus if "Open conversation window" setting is enabled 2017-04-24 15:49:25 +03:00
AndreyL ProductEngine 9791c704c9 MAINT-7320 Avatars without voice mute hould be able to start the calls 2017-04-14 18:54:47 +03:00
andreykproductengine 8f2981f0cf MAINT-7243 Fixed Crash when creating IM session if failed to resolve name 2017-04-11 18:43:44 +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 dd69a22834 Merge viewer-bear 2017-01-27 09:42:51 +01:00
AndreyL ProductEngine 6b1245aa1e MAINT-1322 Voice calls from users with muted text (but not voice) should be received 2017-01-24 18:00:13 +02:00
AndreyL ProductEngine e2bb0c170e MAINT-1322 IMs from users with muted voice (but not text) should be received 2017-01-23 19:51:58 +02:00
Ansariel 73e1d49f91 Adjustment for FIRE-7556: Configurable User Interface sounds 2017-01-02 12:28:55 +01:00
Ansariel e4497dcb87 Merge viewer-lynx 2017-01-02 12:24:50 +01:00
AndreyL ProductEngine e48af9ba0f MAINT-7020 llui/llfloater.cpp should not access settings 2016-12-21 06:57:49 +02:00
Ansariel 98d74e0a91 FIRE-14222: Own group chat is muted on OpenSim if FSMuteAllGroups is TRUE 2016-07-07 12:36:21 +02:00
Ansariel 743e0c0097 Merge Firestorm LGPL tip 2016-04-23 12:27:34 +02:00
Ansariel b6e7c41dbf Merge 2016-04-16 11:42:59 +02:00
Ansariel c7cf6ed618 FIRE-15138: Sharing inventory item sometimes doesn't obey UseLegacyIMLogNames setting 2016-04-15 16:05:57 +02:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Nicky 951e0085e3 Merge. 2016-02-07 00:28:11 +01:00
Ansariel 1f12fbb671 Fix unavailable mode trying to load autoresponse message from wrong setting when autoresponse is sent during IM typing start notification 2016-02-04 12:14:35 +01:00
Ansariel cca57df6f2 FIRE-1949: Echo Autoresponse text into my copy of the IM 2016-02-04 12:11:49 +01:00
Nicky c20277f2f5 Merge. 2015-12-21 20:52:46 +01:00
Nicky 4b7fb09a47 Merge. 2015-12-21 19:16:34 +01:00
Rider Linden 5d897443a9 Merge from Vivox Repo 2015-11-23 13:04:01 -08:00
Ansariel b0542a1a46 Refactor FSCommon 2015-11-14 01:36:57 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky c218e524b2 Merge - Step 1; Still enough to do. 2015-10-26 20:20:13 +01:00
Rider Linden 75c6549fde Set consistent terminology for yield/wait -> suspend for coroutines. 2015-09-18 11:39:22 -07:00
Rider Linden 96bb17f20b Merge 2015-08-25 11:40:36 -07:00
Oz Linden fe2eefd913 merge changes for 3.8.3-release 2015-08-17 16:00:04 -04:00
Nat Goodspeed efa9a0f99c Backed out changeset bab1000e1b2d: restore 'selfless' changes 2015-07-10 19:30:10 -04:00
Rider Linden 247eb0c9c3 Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5 2015-07-07 19:41:27 +01:00
Nat Goodspeed b262ded7e0 MAINT-5351: Remove 'self' parameter from coroutine functions.
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
2015-07-01 18:33:29 -04:00
Ansariel bb4e705ce2 FIRE-16343: Add option to set group chat snooze duration individually per group 2015-06-24 09:41:55 +02:00
Rider Linden d034c4f244 IM session decline using coroutines. 2015-06-04 09:58:27 -07:00
Rider Linden 3e004ce66e Updated feature manager downloader to coroutine.
Added "raw" coroutine handler (returns raw result as LLSD::Binary) and split out the guts of the get, put, etc methods.
Moved getStatusFromLLSD from HttpCoroHandler into HttpCorutineAdapter
2015-05-11 16:52:02 -07:00
Bjoseph Wombat c6650c1330 updates from bitbucket repository 2015-05-11 14:57:57 +01:00
Rider Linden 82b671dadc Convert IM invitation to coroutines. 2015-04-29 14:48:55 -07:00
Bjoseph Wombat 98f98e03bd More voice related changes to improve the user's experience. 2015-03-06 22:14:26 +00:00
Ansariel 1eb0c61ed7 FIRE-16091: The "Snooze" button should start the snooze timer on button press, not on last chat time; patch by Sei Lisa 2015-05-24 11:59:48 +02:00
Northspring 7ed6eccffc FIRE-16035: Add an option to allow friends to bypass conference chat ignoring 2015-05-06 22:33:13 +02:00
Ansariel cec7691ef0 Merge changes from main repo 2015-04-22 21:16:17 +02:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00