Commit Graph

97 Commits (fc971a2c8fb701e07825e1f0abb2c720d40e0bf2)

Author SHA1 Message Date
Ansariel e52d57cba2 Merge LL V3.7.23 2015-01-15 15:44:43 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Aura Linden 78304e398f A patch for maint-4414 2014-09-17 10:33:08 -07:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden 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
Richard Linden a2a6bf20d7 merge with release 2013-06-20 16:46:23 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Richard Linden 6b81b8629e Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies 2013-05-05 17:45:35 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
prep 985b7277e8 WIP SH-4035: confirmation when closing appearance window when changes present 2013-04-08 17:10:46 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07: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
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
merov ac63601a2a CHUI-793 : Fixed! Introduced ChatLoadGroupTimeout and ChatLoadGroupMaxMembers to mitigate slow group loading. 2013-03-11 21:32:40 -07:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Merov Linden d29bec7f4d CHUI-793 : WIP : Limit the number of participants we load on groups when we load from the local group data 2013-03-08 19:04:01 -08: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
Merov Linden 3ae9124ce5 CHUI-395 : Fixed! Check the moderator status in the group data when loading the group list 2013-02-20 19:06:49 -08:00
Cinders 01855fabc7 Refactor OpenSimExtras to use lfsimfeaturehandler with permission from Liru Færs 2013-10-07 23:33:07 -06:00
Merov Linden 46a74c4e01 CHUI-480 : Fixed : Flagged when local update is made and prevent doing it multiple times, allow group to graw by 1 (me) then the rest (prevent having group remaining hidden). 2013-01-23 17:45:25 -08:00
Merov Linden 6bb1c88db2 CHUI-480 : Fixed : Fetch group membership when starting group chat and populate speakers list 2013-01-23 10:13:20 -08:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master 688cca8a73 Merge 2013-07-06 21:19:49 -07:00
ziree 30a2d999fc Crash fix on startup 2013-07-04 21:59:20 +02:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
MaximB ProductEngine dbc37f6ca7 CHUI-397 (Delay in removing names from participant list in nearby chat)
CHUI-440 (Nearby chat participant list does not clear after teleport when conversation floater is closed/minimized)
fixed
2012-11-15 10:38:21 +02:00
Merov Linden ff1dab1792 CHUI-450 : Fixed how the list of speakers is updated, always add the agent avatar in it, takes voice activation into account 2012-11-09 17:19:03 -08:00
MaximB ProductEngine 4ec5ee63e2 CHUI-450 (Your own name does not appear in nearby chat participant list if voice chat disabled)
Added audio module initialization without faking mVoiceEnabled value
2012-11-07 12:07:52 +02:00
Merov Linden e6a7133ef1 CHUI-422 : Add invited non buddies to the initial set of speakers 2012-10-19 13:57:40 -07:00
Merov Linden 1006e2fd25 CHUI-422 : Update the ad-hoc conversation with the known list of on line agents without waiting for server message (which often doesn't come...). 2012-10-17 17:14:44 -07:00
Merov Linden d60609e009 MAINT-1551 : WIP : More tests to elicit a correct answer from the backbone server 2012-10-17 12:26:40 -07:00
Merov Linden 1557bffb56 MAINT-1551 : WIP : Added a hack : send an accept invitation message so to trigger the sending of the agent list. 2012-10-15 19:44:14 -07:00
Merov Linden 5ec3b64a20 MAINT-1551 : WIP : Merge 2012-10-15 14:32:57 -07:00
Merov Linden a8c443feb2 MAINT-1551 : WIP : More IM comm tracing and attempt to fix 2012-10-15 14:29:57 -07:00
Merov Linden 815884e0d4 MAINT-1551 : WIP : Trace IM messaging in and out. 2012-10-15 14:27:47 -07:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Merov Linden bb8820c70b CHUI-340 : WIP : Fix the event firing from LLSpeakerMgr to LLParticipantList 2012-09-20 13:22:21 -07:00
Merov Linden f5fc2a9c3a CHUI-340 : WIP : Update time stamp for IM and voice utterance 2012-09-19 17:59:37 -07:00
Tank_Master 1d43cb8943 Merge SSB push 4 2013-03-08 17:54:49 -08:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Cinders 3e13995a3d FIRE-8046: Support for Aurora Sim Var region - Adapted from Angstrom Viewer with thanks to nhede Core and Revolution Smythe. Also adds support for certain other aurora-sim features which still need some work. 2012-10-28 08:03:39 -06:00
Vadim ProductEngine 9429d5d2f2 EXP-1839 WIP Added some debugging messages. 2012-01-26 19:35:42 +02:00
Ricky Curtice 9bac314ba0 Switched to using *_SQUARED constants instead of multiplied constants, and cleaned up a few other minor issues noted during review. 2011-03-12 23:39:10 -08:00
Ricky Curtice d4d292258e Squared all dist_vec() based comparisons and other dist_vec() operations where sensible.
Not all instances of dist_vec() were squared, only those where it wouldn't (hopefully) change the functionality.
2011-03-10 22:07:06 -08:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00