Commit Graph

509 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
Brad Payne (Vir Linden) 56cf4297f3 SH-4250 WIP - logging tweaks and cleanup 2013-06-13 16:07:02 -04:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Nyx Linden 3e53ade13e merge 2013-04-05 15:24:22 -04:00
prep@lindenlab.com ef6242d729 Merged in chui beta code. 2013-04-02 17:15:48 -05:00
Nyx Linden 323a2f2235 pulling in sunshine-stable to sunshine-internal. 2013-04-02 16:02:13 -04:00
AlexanderP ProductEngine 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
Merov Linden 2d84b0605e CHUI-807 : Trace add and remove sessions 2013-03-29 17:40:16 -07:00
Merov Linden 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
prep@lindenlab.com ab272c20a9 Another Chui beta6+ merge to deal with build issues 2013-03-29 13:22:51 -05:00
Mnikolenko ProductEngine 305d111910 Additional fix for CHUI-903 2013-03-29 18:34:16 +02:00
prep@lindenlab.com 0f24668b0a Merged in Chui beta6+ fixes 2013-03-29 10:37:58 -05:00
Mnikolenko ProductEngine 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
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
AlexanderP ProductEngine 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
AlexanderP ProductEngine 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
Mnikolenko ProductEngine 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
AlexanderP ProductEngine c2f630cf08 CHUI-486 FIXED Update Preferences -> Chat XUI: implemented new bthavior; deleted spaghetti code 2013-03-22 16:06:41 +02:00
prep f345746161 Folded in changes from sunshine-stable 2013-03-21 11:21:45 -04:00
prep@lindenlab.com f2948cb1eb Merge with viewer-chui 2013-03-20 17:53:51 -05:00
Gilbert Gonzales 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
Merov Linden e8b22d3299 Pull merge from lindenlab/viewer-chui 2013-03-15 17:57:48 -07:00
Merov Linden 242c39f24b CHUI-807 : More defensive code. Don't assume anything while iterating through panels. 2013-03-15 17:54:16 -07:00
AlexanderP ProductEngine 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
mberezhnoy 5b4746701b merging 2013-03-14 19:12:38 +02:00
mberezhnoy 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
alexanderpproductengine 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
Mnikolenko ProductEngine 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
Gilbert Gonzales 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
Don Kjer 662d67e3b5 Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures 2013-03-13 08:46:59 +00:00
Don Kjer 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
AlexanderP ProductEngine 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
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Don Kjer 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
mberezhnoy 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
AlexanderP ProductEngine 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
AlexanderP ProductEngine 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
Cho 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
Gilbert Gonzales 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
Mnikolenko ProductEngine 302f57e47f CHUI-744 FIXED KeepConversationLogTranscripts setting is moved to settings_per_account.xml 2013-02-06 20:17:35 +02:00
Merov Linden 3e73b107d3 CHUI-677 : Added a warning printout in the log to capture context of this bug. 2013-02-04 14:41:58 -08:00
mberezhnoy 8fbc0aada8 merging 2013-02-01 01:00:52 +02:00
mberezhnoy 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
maksymsproductengine d2a17e20ca CHUI-612 FIXED Blank conversation names showing in conversation list 2013-01-31 03:16:25 +02:00
mberezhnoy 84148762d9 merging 2013-01-30 21:30:20 +02:00
mberezhnoy 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
Merov Linden 3f4a562508 Pull merge from lindenlab/viewer-chui 2013-01-29 17:50:17 -08:00
Merov Linden 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
Gilbert Gonzales 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
Cho acd28e28bc merging latest changes 2013-01-29 00:19:29 +00:00