Commit Graph

231 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
Nyx Linden 69b062b908 merge with viewer-release 2013-06-18 16:15:03 -04:00
Oz Linden 2df5b9caa6 BUG-2432: Crashfix. Don't call map::erase when the iterator is not valid. 2013-05-21 17:25:51 -04:00
Don Kjer beeefb4526 Renaming HTTP_HEADER_* into HTTP_IN_HEADER_* and HTTP_OUT_HEADER_* to make it more clear which header strings should be used for incoming vs outgoing situations.
Using constants for commonly used llhttpnode context strings.
2013-04-04 21:50:45 +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
prep 11d12f1a99 Merge from viewer-beta 2013-02-13 11:30:36 -05:00
Dave Parks 5a69837345 MAINT-2323 Fix for crash on shutodwn in mesh responder destructors 2013-02-04 12:23:33 -06:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Dave Parks 4a84c7c8e5 More merge cleanup. 2013-01-09 13:20:41 -06:00
Dave Parks 954ebaed84 Automated merge with https://bitbucket.org/lindenlab/viewer-tiger 2013-01-08 13:40:59 -06:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
Dave Parks 5d34ac552f Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-11-20 17:03:55 -06:00
Dave Parks a1d60fc219 MAINT-1311 Thread safe handling of retries on mesh loading failures. 2012-11-09 14:43:25 -06:00
Dave Parks 460002b134 MAINT-1311 Followup on logging and assertions of mesh loading errors 2012-11-08 13:54:28 -06:00
Dave Parks 002634a41b MAINT-1311 Add some logging and assertions to help track down mesh loading errors. 2012-10-26 11:17:06 -05:00
Dave Parks 2fd843c118 MAINT-873 Fix for inability to upload meshes on some systems. 2012-10-17 15:33:01 -05:00
Dave Parks 378e9528d4 MAINT-873 Fix for inability to upload meshes on some systems. 2012-10-17 15:33:01 -05:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Kelly Washington a68c7c27f9 Merge pulled in lindenlab/viewer-beta to kelly_linden/maint-1078 2012-06-27 14:43:10 -07:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00
Nicky e963cefea5 check mesh repo thread before actively using it. 2012-06-01 19:37:10 +02:00
Nicky 944469b84f Make sure only one thread access mPendingLOD at a time. 2012-08-14 19:57:43 +02:00
Kitty Barnett 1300f77fdd Merged with viewer-beta 2012-05-20 17:41:00 +02:00
Oz Linden 95090c5d1e merge changes for version 3.3.1 2012-05-08 15:51:56 -04:00
Dave Parks d8b80cdbb6 MAINT-890 Fix for freeze on exit when a mesh upload is pending. 2012-04-09 12:21:38 -05:00
Dave Parks 654dd60ca7 merge 2012-03-26 15:41:27 -05:00
Dave Parks 6a0eaab160 MAINT-871 Fix for freeze on shutdown while calculating weights and fees of a mesh. 2012-04-13 14:47:30 -05:00
Dave Parks 6ecae04d35 SH-2941 Fix for crash on shutdown due to race condition between LLCurl and LLMeshRepository 2012-02-17 15:33:09 -06:00
Kitty Barnett e0d1ddab21 Merge with viewer-development 2012-02-24 16:12:43 +01:00
Dave Parks 4b20d72a99 merge 2012-03-09 13:26:42 -06:00
Brad Payne (Vir Linden) 344c46a20c merge, conflicts in llvertexbuffer.{h,cpp} 2012-02-06 15:08:41 -05:00
Brad Payne (Vir Linden) 34408bed26 merge 2012-02-01 15:43:11 -05:00
Leslie Linden 127f6d1405 Fixed up LLVolume memory leak caused by mesh repo thread.
Reviewed by Bao.
2012-01-31 16:36:25 -08:00
Dave Parks 63398cd531 SH-2791 Use request class constructor/destructor for keeping track of concurrent requests instead of unreliable increments/decrements sprinkled around the code. 2012-01-24 17:37:20 -06:00
Dave Parks 9e621af3db SH-2791 Use request class constructor/destructor for keeping track of concurrent requests instead of unreliable increments/decrements sprinkled around the code. 2012-01-24 17:37:20 -06:00
Dave Parks f42c3ff51a SH-2885 Add mesh requests pending/processing line to "Show Render Info" 2012-01-19 11:10:22 -06:00
Xiaohong Bao f082de03ff fix for SH-2845, SH-2846, SH-2847, SH-2851: curl crashes and out-of-memory crashes. 2012-01-12 16:36:56 -07:00
Dave Parks 4924f0c99b b782a75c99e6 backout cleanup 2011-10-14 12:38:48 -05:00
Brad Payne (Vir Linden) 4b269f67ea merge 2011-09-14 14:54:20 -04:00
Leslie Linden 1c7b1532e9 Merge from viewer-experience 2011-09-08 10:55:48 -07:00
Brad Payne (Vir Linden) 08c0de785f merge 2011-09-06 09:42:11 -04:00
Brad Payne (Vir Linden) da7f2af75c Fix for model metrics 2011-09-01 17:47:05 -04:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
Nyx (Neal Orman) cb09994ae2 merging in latest mesh-development 2011-08-18 19:17:34 -04:00
Dave Parks f7d17cad5c SH-2188 Fix for generally bad vertex buffer updates for rigged attachments and fix for viewer always thinking meshes initially have 8 texture entries. 2011-08-17 12:55:32 -05:00
Nyx (Neal Orman) 5318730343 FIX SH-859, SH-1274 - added fix for determining triangle count and
performance tested impact of animated textures

Also did some cleanup to ensure branch built and ran properly after
last merge.
2011-08-16 17:51:11 -04:00
Leyla Farazha 10ec004912 merge from viewer-experience 2011-08-12 14:53:25 -07:00
Brad Payne (Vir Linden) 6732f5fbca merge viewer-development to mesh-development 2011-08-10 17:53:11 -04:00
prep linden 20c3d84854 Submitted correction for logic error: if decomp fails for single hull only execute fallback code 2011-08-10 12:50:12 -04:00
Dave Parks 7633b3f1f1 SH-2201 Fix for crash when getting mesh estimates. 2011-08-04 23:42:41 -05:00