summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
AgeCommit message (Collapse)Author
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-02-12merge with releaseRichard Linden
2014-02-11mergeBrad Payne (Vir Linden)
2013-12-11OPEN-113 Use better way of testing for stub that will not impact TPVs.Jonathan Yap
2013-12-11OPEN-113 Build > Upload > Model > Calculate weights & fee is not disabled in ↵Jonathan Yap
OS built viewers
2013-11-12SH-4620 FIX Droplist and spinner overlap edit field and “Browse” button ↵Richard Linden
in the Upload Model window bad visibility setting logic
2013-11-05further fix of inventory keyboard focus and tab order calculationsRichard Linden
2013-10-16mergeBrad Payne (Vir Linden)
2013-10-08merge from viewer-releaseRichard Linden
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-06-20merge with releaseRichard Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-03-22merge with viewer-releaseRichard Linden
2013-03-13Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile ↵Don Kjer
failures
2013-03-13Large changes to the LLCurl::Responder API, as well as pulling in some ↵Don Kjer
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-08SH-3959 WIP - pass information about type of fetched image - server bake, ↵Brad Payne (Vir Linden)
host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-03-07For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936Graham Madarasz (Graham)
2013-03-06For MAINT-1842 fix model validation to check for NaNsGraham Madarasz
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2012-11-15SH-3406 WIP convert fast timers to lltrace systemRichard Linden
eliminated min and max macros from windows.h got rest of viewer to compile against llfasttimer changes
2012-10-23MAINT-1567 cleanup some gcc warningsDave Parks
2012-10-23MAINT-1567 Fix for incorrect triangle and hull counts in mesh importer.Dave Parks
Reviewed by VoidPointer
2012-10-16MAINT-643 Fix for incorrect lighting and colors in preview displays.Dave Parks
2012-10-12MAINT-1568 Fix for inconsistent triangle counts when changing LoD sources in ↵Dave Parks
model importer
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-09-04Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTextureDon Kjer
2012-07-24merge to viewer-developmentoOz Linden
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-11MAINT-1253 Rigged meshes in the upload model window now have a material ↵prep
applied instead of white.
2012-06-27merge changes for DRTVWR-167Oz Linden
2012-06-22mergeDave Parks
2012-06-12PATH-735: Limit and clean up grid selectionOz Linden
2012-06-04mergeBrad Payne (Vir Linden)
2012-05-24MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback.Dave Parks
2012-05-21MAINT-616 Factor out calls to glGenFoo where possible, add setting to ↵Dave Parks
control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
2012-05-18STORM-1860 Remove obsolete code and file(s) for mesh model upload wizardJonathan Yap
2012-02-08mergeBrad Payne (Vir Linden)
2012-01-27SH-2684 FIX, SH-2716 FIX - bug was specific to running in non-english languageBrad Payne (Vir Linden)
2012-01-04SH-2789 WIP - stricter calling of memcpyNonAliased16Brad Payne (Vir Linden)
2011-12-21SH-2794 WIP -- work on getting glMapBuffer and friends to behaveDave Parks
2011-12-12merge changes for vmrg-204Oz Linden
2011-11-30Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-11-29mergeDave Parks
2011-11-28bumped up MSVC warning level to 3 to catch more stuff that gcc catchesRichard Linden
2011-11-24merge changes for vmrg-193Oz Linden
2011-11-22mergeBrad Payne (Vir Linden)
2011-11-21SH-2614 FIX, SH-2684 FIX - fixed buggy state management in onPhysicsUseLODBrad Payne (Vir Linden)
2011-10-19mergeDave Parks
2011-10-19mergeBrad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-12 11:12:28 +0000