9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
f7fa3b5f56
Floater IM Session to trivial coroutine.
...
Changed debugging output from core utitl to string.
2015-05-22 10:59:43 -07:00
24f035a7b7
Update to build on Xcode 6.0: clang fix for bracketed logical operations
2014-10-18 12:02:16 -07:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
db977d6df8
MAINT-4135 FIXED Text input field is not disabled in group chat window for user who cannot enter text chat
2014-06-10 19:51:11 +03:00
67051b26ba
merge
2014-05-19 18:10:45 -04:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
969cb45920
merge
2014-02-11 16:04:31 -05:00
cb2045fcd5
Merge downstream code with viewer-release
2014-02-10 16:11:50 -08:00
744cf6be8d
merge
2013-12-05 10:39:35 -05:00
b93374e070
MAINT-3334 (If a chat tab is in focus when you enter mouselook, chat that occurs while in mouselook does not display after exiting mouselook)
2013-11-28 14:16:35 +02:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
d1b4c5bf73
merge changes for 3.6.10-release
2013-11-11 16:40:22 -05:00
ef825a1d2c
STORM-1975 Changed timeout constants to
...
ME_TYPING_TIMEOUT = 4.0
OTHER_TYPING_TIMEOUT = 9.0
2013-10-30 16:20:32 -04:00
c5df71b1c4
STORM-1975 Convert old-style debugging lines to new-style
2013-10-29 16:21:17 -04:00
07c011bc9c
STORM-1975 IM windows occasionally report false typing status.
2013-10-29 15:12:39 -04:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
144eb1912d
merge
2013-09-04 13:41:51 -04:00
a6c4863a6a
Build fix after patch for MAINT-3137
2013-09-13 13:11:41 +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
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
497789c476
CHUI-973 FIXED Speaking indicator was removed
2013-06-06 19:00:11 +03:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -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
5ff0d34ab7
CHUI-944 FIXED Show Voice indicator for P2P torn off conversations.
2013-05-13 15:13:16 +03:00
043f2e0bfd
Pull from viewer-release
2013-05-02 14:09:40 -07:00
e4207901d7
CHUI-934 FIXED Do not add to vector if session is closed to avoid crash.
2013-04-25 14:52:28 +03:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
33d6f8a595
CHUI-934 FIXED Don't try to close Session floater if it is already doesn't exist.
2013-04-12 14:58:11 +03:00
3e53ade13e
merge
2013-04-05 15:24:22 -04:00
ef6242d729
Merged in chui beta code.
2013-04-02 17:15:48 -05:00
323a2f2235
pulling in sunshine-stable to sunshine-internal.
2013-04-02 16:02:13 -04:00
b37f501a87
CHUI-796 (User doesn't get all messages in 'do not disturb' mode): Now when a conversation is focused by clicking on it's line item, selecting a torn off floater or unminimized a torn off floater the stored notifications for that conversation will be removed.
2013-04-01 15:36:05 -07:00
0f24668b0a
Merged in Chui beta6+ fixes
2013-03-29 10:37:58 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
9f819806cd
CHUI-901 : Fixed! Do touch torn off state in restoreFloater()
2013-03-27 16:08:03 -07:00
f345746161
Folded in changes from sunshine-stable
2013-03-21 11:21:45 -04:00
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05:00
bc8ac5854f
CHUI-620 FIXED Clear the highlight when auto-selecting new conversation or when text is entered into the message panel.
2013-03-18 14:37:21 +02:00
ee4fbb8e37
CHUI-830 FIXED Button for collapsing torn-off floater(to a single input line) is added.
...
Show toasts for new messages for that conversation, regardless of other prefs.
2013-03-15 12:33:46 +02:00
662d67e3b5
Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures
2013-03-13 08:46:59 +00:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
56b158e486
CHUI-675 FIX You can select multiple users in people floater but can only drag and drop one name to conversation
...
Moved drag and drop start in LLAvatarListItem instead of LLAvatarList, and made LLFloaterIMSession handle multiple dropped participants correctly
2013-02-01 18:54:15 +00:00
acd28e28bc
merging latest changes
2013-01-29 00:19:29 +00:00
f9d44737b7
merging latest changes
2013-01-29 00:19:05 +00:00
44b681f5db
CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication Console Immediately.
...
Removed new code from on_new_message in LLIMView and instead, changed condition in LLFloaterIMSession::newIMCallback to update messages whenever the floater is visible
2013-01-29 00:16:40 +00:00
Oz Linden