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
0bcb1db3ea
CHUI-972 FIXED Don't show voice request in DND mode, even if session with participant exists.
2013-06-04 20:24:10 +03:00
5287578d93
CHUI-918 FIXED "Close all conversations" menu item is added to context menu.
2013-05-29 20:22:45 +03:00
1c740dfb51
Pull merge from viewer-release
2013-05-22 14:21:49 -07:00
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
a04a706c1b
merge
2013-05-21 16:18:48 -04:00
3187ee18e1
CHUI-945 FIXED Add Object IMs to Chat Notification Preferences
2013-05-15 20:31:47 +03:00
73fa7a46b5
CHUI-913 Additional fix
2013-05-16 19:04:52 +03:00
0f35d68d6f
CHUI-913 FIXED Show toasts for torn-off windows that aren't collapsed.
2013-05-15 14:57:11 +03:00
6b81b8629e
Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies
2013-05-05 17:45:35 -07:00
043f2e0bfd
Pull from viewer-release
2013-05-02 14:09:40 -07:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
6ad4822a05
CHUI-933 FIXED No notification of IMs when coming out of Do Not Disturb mode with Flash Toolbar button preference
2013-04-17 19:55:13 +03:00
d35c61a21a
CHUI-923 FIXED Show toasts if Conversation floater is focussed and current conversation is not selected.
2013-04-09 14:53:22 +03:00
3e53ade13e
merge
2013-04-05 15:24:22 -04:00
simon