9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
5d897443a9
Merge from Vivox Repo
2015-11-23 13:04:01 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
75c6549fde
Set consistent terminology for yield/wait -> suspend for coroutines.
2015-09-18 11:39:22 -07:00
96bb17f20b
Merge
2015-08-25 11:40:36 -07:00
fe2eefd913
merge changes for 3.8.3-release
2015-08-17 16:00:04 -04:00
efa9a0f99c
Backed out changeset bab1000e1b2d: restore 'selfless' changes
2015-07-10 19:30:10 -04:00
247eb0c9c3
Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5
2015-07-07 19:41:27 +01:00
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
d034c4f244
IM session decline using coroutines.
2015-06-04 09:58:27 -07:00
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
c6650c1330
updates from bitbucket repository
2015-05-11 14:57:57 +01:00
82b671dadc
Convert IM invitation to coroutines.
2015-04-29 14:48:55 -07:00
98f98e03bd
More voice related changes to improve the user's experience.
2015-03-06 22:14:26 +00:00
301714944a
MAINT-1016 FIXED Don't remove other chat participant from mute list if it's group chat.
2015-01-30 11:33:23 +02:00
ae04cb8549
MAINT-4621 FIXED start new session with the caller (if it doesn't exist) and only then show autoreject message
2014-11-05 12:36:56 +02:00
3e6698073c
Merge viewer-release and become version 3.7.12
2014-07-07 14:49:45 -07:00
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
09d1c27d4f
MAINT-3822 FIXED Show busy mode message only once for each im session.
2014-03-14 12:21:25 +02:00
e9116575bf
OPEN-209: Corrected all instances of trigraphs in the code.
...
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
ac9849fb03
fixed mispelling of generateOutgoingAdHocHash
2014-02-26 11:59:49 -08:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
7866356d77
Merge viewer-release => sunshine-internal
2013-10-29 13:20:18 +00:00
1f8b37e9ad
merge
2013-10-16 11:52:43 -04:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
1e32b9dd33
Pull merge of lindenlab/viewer-release
2013-10-04 09:47:26 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
144eb1912d
merge
2013-09-04 13:41:51 -04:00
f37023a060
MAINT-3048 FIXED Don't block IMs from Lindens even when "Only friends and groups can call or IM me" is set
2013-08-29 12:11:41 +03:00
c767354a20
merging viewer release
2013-08-28 18:30:38 -07:00
01a7002228
MAINT-3163 FIXED Since CHUI, floaters can be moved totally underneath bottom toolbar buttons and "lost".
2013-09-26 00:34:00 +03:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
9da176181a
CHUI-986 FIXED Don't open Conversation floater for offline IMs if it's not from group or friend.
2013-07-23 14:02:50 +03:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
7da4c65191
Pull merge from lindenlab/viewer-release
2013-06-19 14:06:06 -07:00
db803e193e
Merge conflict mixup, use noaction instead of none for user preference
2013-06-19 13:51:12 -07:00
b3c010ea71
Pull merge lindenlab/viewer-release
2013-06-19 12:24:44 -07:00
f922605ec6
CHUI-979 FIXED Clear highlight after clicking in chat input. Do not flash chat button if current conversation is focused and torned off.
2013-06-18 20:43:18 +03:00
56cf4297f3
SH-4250 WIP - logging tweaks and cleanup
2013-06-13 16:07:02 -04:00
2a93df9888
CHUI-896 ADD FIX Line flashing and FUI button flashing not working correctly for CHUI notifications
...
1) Fixed line flashing upon conversation floater opening (previously was highlight only)
2) Fixed line highlight (and flashing) clearing when clicking Chat input field
2013-06-12 19:22:27 +03:00
0cf9597bd5
CHUI-926 FIXED FUI button will stay highlight(orange) if there are unread IMs when the conversation floater is minimized.
2013-06-11 15:30:31 +03:00
ab37c8b8f5
CHUI-896 ADD FIX Line flashing and FUI button flashing not working correctly for CHUI notifications
...
Fixed line flashing when conversations floater is open but does not have focus
2013-06-06 19:49:42 +03:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
Oz Linden