Commit Graph

342 Commits (788ce7a8cdbbbf98566ce75ec281ec00c21dc6d8)

Author SHA1 Message Date
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Brad Payne (Vir Linden) 969cb45920 merge 2014-02-11 16:04:31 -05:00
Jonathan Yap 97d9eee4ff OPEN-113 Use better way of testing for stub that will not impact TPVs. 2013-12-11 14:29:52 -05:00
Jonathan Yap 81d1d427f1 OPEN-113 Build > Upload > Model > Calculate weights & fee is not disabled in OS built viewers 2013-12-11 10:41:28 -05:00
Richard Linden 0eba8e8f23 SH-4620 FIX Droplist and spinner overlap edit field and “Browse” button in the Upload Model window
bad visibility setting logic
2013-11-12 18:47:55 -08:00
Richard Linden a10eb7b240 further fix of inventory keyboard focus and tab order calculations 2013-11-05 19:30:38 -08:00
Brad Payne (Vir Linden) 1f8b37e9ad merge 2013-10-16 11:52:43 -04:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -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 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
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Richard Linden 68f9f656cd merge with viewer-release 2013-03-22 00:44:59 -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
Brad Payne (Vir Linden) 5a436e46f6 SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed 2013-03-08 17:07:17 -05:00
Graham Madarasz (Graham) 2e8b2558b4 For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936 2013-03-07 14:13:14 -08:00
Graham Madarasz eda81f68ca For MAINT-1842 fix model validation to check for NaNs 2013-03-06 09:07:33 -08: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
Richard Linden c136b43214 SH-3406 WIP convert fast timers to lltrace system
eliminated min and max macros from windows.h
got rest of viewer to compile against llfasttimer changes
2012-11-15 19:46:09 -08:00
Dave Parks 8039c4583e MAINT-1567 cleanup some gcc warnings 2012-10-23 14:31:34 -05:00
Dave Parks 10697d59b6 MAINT-1567 Fix for incorrect triangle and hull counts in mesh importer.
Reviewed by VoidPointer
2012-10-23 13:35:11 -05:00
Dave Parks ec125540c4 MAINT-643 Fix for incorrect lighting and colors in preview displays. 2012-10-16 16:25:01 -05:00
Dave Parks 9b7bfcf594 MAINT-1568 Fix for inconsistent triangle counts when changing LoD sources in model importer 2012-10-12 17:25:17 -05:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
Oz Linden 8df3619621 merge to viewer-developmento 2012-07-24 10:51:37 -04:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
prep f71d1db58d MAINT-1253 Rigged meshes in the upload model window now have a material applied instead of white. 2012-07-11 10:47:45 -04:00
Oz Linden 2c3e78f1f1 merge changes for DRTVWR-167 2012-06-27 14:18:22 -04:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Oz Linden d500379cea PATH-735: Limit and clean up grid selection 2012-06-12 21:58:52 -04:00
Brad Payne (Vir Linden) 542975b4c6 merge 2012-06-04 16:19:18 -04:00
Dave Parks efda0814cb MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback. 2012-05-24 10:50:48 -05:00
Dave Parks b7cfd8c7f0 MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update 2012-05-21 23:33:25 -05:00
Jonathan Yap dd5d7fadca STORM-1860 Remove obsolete code and file(s) for mesh model upload wizard 2012-05-18 12:12:42 -04:00
Brad Payne (Vir Linden) 635a264e6f merge 2012-02-08 11:22:52 -05:00
Brad Payne (Vir Linden) cd46f4a7b9 SH-2684 FIX, SH-2716 FIX - bug was specific to running in non-english language 2012-01-27 13:56:03 -05:00
Brad Payne (Vir Linden) 1435a8b9e6 SH-2789 WIP - stricter calling of memcpyNonAliased16 2012-01-04 15:21:23 -05:00
Dave Parks 5546041301 SH-2794 WIP -- work on getting glMapBuffer and friends to behave 2011-12-21 15:55:14 -06:00
Oz Linden f1a4593e47 merge changes for vmrg-204 2011-12-12 09:04:33 -05:00
Richard Linden c191f523a9 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-30 17:57:09 -08:00
Dave Parks 85392acac0 merge 2011-11-29 14:43:09 -06:00
Richard Linden d089e6c264 bumped up MSVC warning level to 3 to catch more stuff that gcc catches 2011-11-28 19:16:49 -08:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
Brad Payne (Vir Linden) 810a00469a merge 2011-11-22 09:50:29 -05:00
Brad Payne (Vir Linden) 1dd24cfcf8 SH-2614 FIX, SH-2684 FIX - fixed buggy state management in onPhysicsUseLOD 2011-11-21 17:40:12 -05:00
Dave Parks f19f43c746 merge 2011-10-19 16:21:18 -05:00
Brad Payne (Vir Linden) 4dd15ae27d merge 2011-10-19 11:45:42 -04:00