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
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
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
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
662d67e3b5
Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures
2013-03-13 08:46:59 +00:00
f945415210
Large changes to the LLCurl::Responder API, as well as pulling in some changes to common libraries from the server codebase:
...
* Additional error checking in http handlers.
* Uniform log spam for http errors.
* Switch to using constants for http heads and status codes.
* Fixed bugs in incorrectly checking if parsing LLSD xml resulted in an error.
* Reduced spam regarding LLSD parsing errors in the default completedRaw http handler. It should not longer be necessary to short-circuit completedRaw to avoid spam.
* Ported over a few bug fixes from the server code.
* Switch mode http status codes to use S32 instead of U32.
* Ported LLSD::asStringRef from server code; avoids copying strings all over the place.
* Ported server change to LLSD::asBinary; this always returns a reference now instead of copying the entire binary blob.
* Ported server pretty notation format (and pretty binary format) to llsd serialization.
* The new LLCurl::Responder API no longer has two error handlers to choose from. Overriding the following methods have been deprecated:
** error - use httpFailure
** errorWithContent - use httpFailure
** result - use httpSuccess
** completed - use httpCompleted
** completedHeader - no longer necessary; call getResponseHeaders() from a completion method to obtain these headers.
* In order to 'catch' a completed http request, override one of these methods:
** httpSuccess - Called for any 2xx status code.
** httpFailure - Called for any non-2xx status code.
** httpComplete - Called for all status codes. Default implementation is to call either httpSuccess or httpFailure.
* It is recommended to keep these methods protected/private in order to avoid triggering of these methods without using a 'push' method (see below).
* Uniform error handling should followed whenever possible by calling a variant of this during httpFailure:
** llwarns << dumpResponse() << llendl;
* Be sure to include LOG_CLASS(your_class_name) in your class in order for the log entry to give more context.
* In order to 'push' a result into the responder, you should no longer call error, errorWithContent, result, or completed.
* Nor should you directly call httpSuccess/Failure/Completed (unless passing a message up to a parent class).
* Instead, you can set the internal content of a responder and trigger a corresponding method using the following methods:
** successResult - Sets results and calls httpSuccess
** failureResult - Sets results and calls httpFailure
** completedResult - Sets results and calls httpCompleted
* To obtain information about a the response from a reponder method, use the following getters:
** getStatus - HTTP status code
** getReason - Reason string
** getContent - Content (Parsed body LLSD)
** getResponseHeaders - Response Headers (LLSD map)
** getHTTPMethod - HTTP method of the request
** getURL - URL of the request
* It is still possible to override completeRaw if you want to manipulate data directly out of LLPumpIO.
* See indra/llmessage/llcurl.h for more information.
2013-03-13 06:26:25 +00: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
d0204ab367
CHUI-687: Problem: User sees inventory offer notifications for deleted items when logging in from do not disturb mode. Resolution: If an item that is deletes has a DND notification saved, then remove that notification so that it doesn't appear onec the user exists DND mode.
2013-01-23 09:51:17 -08:00
8c3d3d4b07
CHUI-618 ADD FIX User sees no indication of offline messages received with conversation log preference turned off: forced flashing of conversation's item when offline message is present
2013-01-16 16:40:59 +02:00
0e90e94a4d
CHUI-668: The user's most intrusive notification is not used anymore when coming out of DND mode with IMs. Adjusted code to just open the converseation floater (which was changed also in a prior fix by PE).
2013-01-14 17:23:06 -08:00
44737a3992
merging latest changes
2013-01-14 10:59:46 -08:00
e42755dd16
CHUI-668: Now when exiting DND mode, the user's most intrusive notification will be used to notify that user (if received IM's during DND mode). Nearby chat messages/settings are ignored.
2013-01-11 19:43:12 -08:00
69497e645b
CHUI-668: Not fully complete but as of this commit, have functionality to use the user's most intrusive chat notification upon exiting from DND mode with IM's. Also if in DND mode, clicking on a conversation line item or floater, will flush the DND notifications system of storing that conversation. This way upon existing DND mode already responded conversations won't be notified to the user.
2013-01-11 18:20:29 -08:00
23ffb7db1b
CHUI-618 ADD FIX User sees no indication of offline messages received with conversation log preference turned off: changed in accordance with a new requirements (open conv. floater instead flashing)
2013-01-12 01:51:43 +02:00
41d5f820ea
CHUI-670: Prevent flashing of 'Chat' FUI button while in DND mode and receive IM.
2013-01-09 14:30:10 -08:00
6a30c4c3c5
CHUI-669: Upon DND mode exit, no longer flash IM messages that were stored during DND mode.
2013-01-09 13:30:14 -08:00
bb05a29374
CHUI-638 FIXED Don't force button and widget to flash if the object is muted.
2013-01-09 15:08:58 +02:00
613b7a45a7
Merge with viewer-chui
2013-01-04 21:33:07 -08:00
fbc414c02b
Merge with viewer-chui
2013-01-04 20:28:01 -08:00
6153d09e52
merging in latest changes
2013-01-04 19:01:10 -08:00
02ca16c133
CHUI-499: Now when existing DND mode, stored IM's will not show a toast but instead flash the conversation line item and Chat FUI button.
2013-01-04 17:58:30 -08:00
d99fa985c8
CHUI-566 ADD. FIX Flashing and color on Conversations FUI button and conversation line item
...
Cancel sticking of color, if the button is pressed, or when a flashing of the previously selected button is ended
2012-12-28 18:55:24 +02:00
7549a392cc
CHUI-566 Flashing and color on Conversations FUI button and conversation line item:
...
change behavior for the case "If conversations (container) floater open but not on top"
2012-12-21 16:28:33 +02:00
2610af9798
CHUI-619 FUI button and conversation line items blink at different rates:
...
changed rate
2012-12-21 15:35:56 +02:00
2aefdb47ca
CHUI-618 User sees no indication of offline messages received with conversation log preference turned off: flashing of CHUI button if offline messages was received
2012-12-20 15:24:14 +02:00
c81cf89086
CHUI-600 : Fix the orange (provided by Leo), fix the conversation item flashing (when shown)
2012-12-19 17:10:31 -08:00
dcfcc191dd
Pull merge from richard/viewer-chui
2012-12-19 12:45:59 -08:00
c2d332a89c
CHUI-580 : WIP : Added disconnect of callbacks once they're called to prevent filling up the callback queue
2012-12-17 20:16:33 -08:00
6fe7144104
CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary
2012-12-17 18:59:01 -08:00
22c2fff4ba
CHUI-566 Flashing and color on Conversations FUI button and conversation line item
2012-12-14 19:56:05 +02:00
accad65d6a
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui.
2012-12-18 19:15:53 -08:00
c73947ac1f
CHUI-499: Adding ability to serialize the communication notifications to local disk per user.
2012-12-18 18:48:15 -08:00
13a619cb5f
CHUI-385: Problem: When the new session was created with multiple participants the old conversation floater was being recycled. When the conversation floater was re-initialized it did not remove and update the chat messages. Resolution: When the conversation floater is recycled simply call reloadMessages().
2012-12-18 18:15:28 -08:00
09163617c2
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui.
2012-12-17 14:16:47 -08:00
56973ed9a4
CHUI-505 : Fixed : Don't open Call Log on login if the user doesn't want a Call Log:
...
Checked the setting status
2012-12-15 17:35:24 +02:00
64dffe4611
CHUI-598 : Fixed : Conversation log file created even when keep conversation log preference is off :
...
Checked the status of the another ("KeepConversationLogTranscripts") setting too.
2012-12-15 20:37:18 +02:00
3636b10d47
CHUI-494: Removing the creation of a new session while receiving an IM in DND mode.
2012-12-11 20:46:10 -08:00
79b44fa561
Pull merge from richard/viewer-chui
2012-12-07 19:00:35 -08:00
2965cdf5db
CHUI-579: Found a small bug in my last commit causing nearby chat im's to show two toast messages. Now the upper right toast (im toasts) will only show when the session id is non NULL (Nearby chat has a session value that is NULL).
2012-12-07 15:03:12 -08:00
0037b1e2c7
CHUI-579: Post code review. Renamed variables to make easier to read.
2012-12-07 14:44:15 -08:00
dd030f1b75
merging in latest changes
2012-12-07 10:25:39 -08:00
218cbebbd8
CHUI-579: When the 'Pop up message' preference is set the conversation line item and/or FUI button flash depending on what is focused. Also when the 'Flash the toolbar button' preference is set the FUI button will flash or the line item will flash depending upon what is focused.
2012-12-06 15:52:55 -08:00
e2c080b558
CHUI-505 FIXED Open Call Log if user has new events while out:
...
force open Conversation Log Floater when received a saved offline message
2012-12-06 19:26:52 +02:00
42a60e6ca5
Pull merge from dev repo
2012-12-05 20:26:26 -08:00
3a49beed0e
CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-05 20:25:46 -08:00
8642088d65
CHUI-571: Fixed bug where when the converation floater was torn off and a new im received, the incorrect conversation would be displayed and focused. In order to do this removed the conversation floater panels from being focused immediately when set visible. Also there was a bug when showing the stub panel for torn off conversations. The tab container was not setting the stub panel index properly to 0, which is where the stub panel existed in the tab container's list. This is post code review submit. Will submit another with minor code review changes.
2012-12-04 19:23:36 -08:00
2ee6bcab37
CHUI-571: Now when the 'Chat Preference' is set to 'Open Conversations window' the conversation line item with flash. The only time it does not flash is when the the conversation line item is already focused. Also fixed various focusing bugs when navigating between conversations and participants.
2012-12-03 16:19:46 -08:00
3792a6aab8
CHUI-546 FIXED Blank IM toast shown when a nearby chat toast is shown:
...
Prosessing of the nearby chat was exluded from on_new_message()
2012-11-28 19:39:27 +02:00
4105ae9467
CHUI-529: Post code review changes. When showing a floater using LLFloater::showInstance() instead of setVisibleAndFrontmost(). Also made setVisibleAndFrontmost() public since both setVisible and setFrontmost are public functions.
2012-11-26 19:12:04 -08:00
14e82732f4
merging in latest changes, resolved llimview.cpp conflict
2012-11-26 14:50:36 -08:00
890965faf5
CHUI-528, CHUI-536, CHUI-538, CHUI-540 ADD. FIX (Built single processor of different types of notifications): clean up code
2012-11-23 15:14:17 +02:00
cbe90ebc9c
Additional fix for CHUI-490 (Show "Display Name (user.name)" for the user that is calling)
2012-11-23 19:05:28 +02:00
1ece389121
CHUI-528, CHUI-536, CHUI-538, CHUI-540 Built single processor of different types of notifications
2012-11-20 19:17:25 +02:00
81478d6c44
CHUI-490 FIXED Small ui changes. Changed sound that is playing when floater is opened.
...
Call startIM() when user clicks on "Open IM instead" button.
2012-11-20 18:57:29 +02:00
aba409f24f
CHUI-495: Ensuring that a user in do-not-disturb mode can receive voice calls from current conversations.
2012-11-19 17:14:18 -08:00
a897e69ffc
merging in latest changes
2012-11-16 18:53:39 -08:00
prep@lindenlab.com