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
ef6242d729
Merged in chui beta code.
2013-04-02 17:15:48 -05:00
09db2bd9ff
CHUI-896 : ADD FIX : Line flashing and FUI button flashing not working correctly for CHUI notifications
...
backed out 902caf2 and (partly) d498514; case "NOT_ON_TOP" was fixed
2013-04-01 19:40:40 +03:00
2d84b0605e
CHUI-807 : Trace add and remove sessions
2013-03-29 17:40:16 -07:00
7c7ccf27d1
CHUI-807 : Add more defensive coding. Also trace in log the sessions created so we'll have a better idea of what people do with conversations if we see that crash again.
2013-03-29 17:22:53 -07:00
ab272c20a9
Another Chui beta6+ merge to deal with build issues
2013-03-29 13:22:51 -05:00
305d111910
Additional fix for CHUI-903
2013-03-29 18:34:16 +02:00
0f24668b0a
Merged in Chui beta6+ fixes
2013-03-29 10:37:58 -05:00
a62a824efb
CHUI-903 FIXED Don't show toasts if Session floater is torn-off and in focus.
2013-03-29 15:23:17 +02:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8e3a85ed66
CHUI-896 FIXED Line flashing and FUI button flashing not working correctly for CHUI notifications: added flashing of the line item after conv. floater opens
2013-03-28 05:49:28 +02:00
3a31b47028
CHUI-486 ADD FIX Update Preferences -> Chat XUI
...
1) when preference is "Pop up" - added toast according to Kurt's comment from 22/Dec/12;
2) fixed line item flashing and "Chat" button flashing in other cases according to original matrix.
2013-03-27 22:52:41 +02:00
9e180d9c8f
CHUI-895 FIXED Show toasts for messages if conversation is collapsed to Input bar(regardless of other prefs).
2013-03-27 15:22:25 +02:00
c2f630cf08
CHUI-486 FIXED Update Preferences -> Chat XUI: implemented new bthavior; deleted spaghetti code
2013-03-22 16:06:41 +02:00
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05:00
c4f283334c
CHUI 796 (User doesn't get all messages in 'do not disturb' mode): Now IM DND notifications will be stored as p2p, ad-hoc or group. When loading these notifications upon app start ad-hoc/group notifications will launch the conversation log and play a sound.
2013-03-19 11:34:13 -07:00
e8b22d3299
Pull merge from lindenlab/viewer-chui
2013-03-15 17:57:48 -07:00
242c39f24b
CHUI-807 : More defensive code. Don't assume anything while iterating through panels.
2013-03-15 17:54:16 -07:00
780fe4e37f
CHUI-831 ADD FIX Minimized conversation floater is not opened with Open Conversation Window preference if conversation receiving message is selected
2013-03-15 17:39:09 +02:00
5b4746701b
merging
2013-03-14 19:12:38 +02:00
3ee18d8b29
CHUI-844 (Collapsed conversation panel auto expands when a new IM conversation starts)
...
CHUI-713 ("Conversations" floater size doesn't persist between sessions)
2013-03-14 11:28:56 +02:00
bd8b0de897
CHUI-831 ADD FIX Minimized conversation floater is not opened with Open Conversation Window preference if conversation receiving message is selected
2013-03-13 22:18:41 +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
f0b1d1c7ea
CHUI-853 (Crashing on ejecting member in group): Upon receiving the rejection response message, the incorrect session id was being used to display the message. session_id was being used instead of new_session_id.
2013-03-14 16:55:11 -07:00
aa8809ff3b
CHUI-831 Minimized conversation floater is not opened with Open Conversation Window preference if conversation receiving message is selected : force unminimized of the session's floater
2013-03-12 17:20:15 +02:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
54cdc322b8
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
2013-03-05 22:05:22 -08:00
23ca3a1f2c
CHUI-806 (IM floater is not become as a top while geting message with enabled 'Open conversation window' option)
2013-03-04 17:11:14 +02:00
c48e644220
CHUI-773 ADD FIX Conversation line item does not flash for unselected conversation when Flash Toolbar Button preference is selected : repair case "open and not on top"
2013-02-20 17:11:50 +02:00
8c20b1e002
CHUI-773 Conversation line item does not flash for unselected conversation when Flash Toolbar Button preference is selected: add flashing in "toast" case when session floater is open but not selected
2013-02-14 18:33:07 +02:00
33d49d1569
CHUI-755 FIX Conversation log changes in a session are lost if viewer crashes
...
Added call to LLConversationLog::instance().cache() after LLLogChat::SaveHistory() in LLIMView::logToFile()
2013-02-11 20:02:19 +00:00
29a57c16c9
CHUI-736: When auto-exit DND mode upon startup, stored conversations are not highlighted. When the dnd im is processed, now flash the conversation line item.
2013-02-07 14:41:38 -08:00
302f57e47f
CHUI-744 FIXED KeepConversationLogTranscripts setting is moved to settings_per_account.xml
2013-02-06 20:17:35 +02:00
3e73b107d3
CHUI-677 : Added a warning printout in the log to capture context of this bug.
2013-02-04 14:41:58 -08:00
8fbc0aada8
merging
2013-02-01 01:00:52 +02:00
a12200b91b
CHUI-718 (User does not see own chat in conference IM)
...
CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears, after ejecting any member from group)
2013-01-31 10:04:15 +02:00
d2a17e20ca
CHUI-612 FIXED Blank conversation names showing in conversation list
2013-01-31 03:16:25 +02:00
84148762d9
merging
2013-01-30 21:30:20 +02:00
b96f04a1bb
CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears, after ejecting any member from group)
2013-01-30 08:16:47 +02:00
3f4a562508
Pull merge from lindenlab/viewer-chui
2013-01-29 17:50:17 -08:00
df84e3c187
CHUI-436 : Fixed : Do not skip yourself or group chat when checked Only friends and groups can call or IM me pref.
2013-01-29 17:47:34 -08:00
edb5be4ec0
CHUI-88 I shouldn't see Conference IMs from people I muted. Fix: In order to mute a user who initiated a conference/group chat, the session must be created on the server side and then left.
2013-01-29 14:41:37 -08:00
acd28e28bc
merging latest changes
2013-01-29 00:19:29 +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
c1b8e4b1ff
undid accidental revert of someone else's fix
2013-01-26 00:36:49 +00:00
fa54b50e02
CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication Console Immediately.
...
Added call to LLFloaterIMContainer::selectConversation() in on_new_message for LLIMView
2013-01-26 00:19:29 +00:00
2ac99f55f9
CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tab
2013-01-24 19:56:13 +02:00
aa524b18e5
CHUI-701 FIXED Don't show toasts and flashing, if conversation is opened but isn't focused.
2013-01-28 14:57:51 +02:00
Graham Madarasz