Commit Graph

85 Commits (bdce32a02b34e42ab2f145af5f8beb54f4e2b534)

Author SHA1 Message Date
Brad Payne (Vir Linden) 487ca1bad3 v-r -> s-e merge WIP 2014-05-14 17:50:59 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Brad Payne (Vir Linden) d9e3a2948a merge 2014-03-12 17:24:07 -04:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Graham Madarasz (Graham Linden) e7021407cb MAINT-3639 disable ALM for OSX 10.6.8 2014-02-11 10:16:11 -08:00
Brad Payne (Vir Linden) 744cf6be8d merge 2013-12-05 10:39:35 -05:00
Richard Linden 34ff2fc46b merge with release 2013-12-02 14:57:29 -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
Graham Linden 0103cac1dd Merge viewer-bear maint RC changes to get this build closer to the RC it will follow 2013-09-26 11:44:40 -07:00
maksymsproductengine bd0a8c7ee9 MAINT-3128 FIXED Advanced graphical settings are not changing when dragging "Quality and Speed" slider 2013-09-11 00:41:10 +03:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Oz Linden 980802e468 STORM-1552: detect, ignore, and delete invalid feature and gpu table files 2013-09-05 22:06:16 -04:00
Brad Payne (Vir Linden) 144eb1912d merge 2013-09-04 13:41:51 -04:00
Richard Linden 612892b45a SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -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
Nat Goodspeed c08b60ac6f CHOP-959: Streamline processing for --graphicslevel switch.
Use map-to in cmd_line.xml to inform the command-line processor that the
target variable for --graphicslevel is RenderQualityPerformance.
That lets us eliminate clunky llappviewer.cpp switch from '0' to 0, etc.
Moreover, previous switch statement only accepted 0 - 3, whereas
LLFeatureManager::setGraphicsLevel() actually accepts 0 - 6. Introduce
LLFeatureManager::isValidGraphicsLevel() and use that to validate.
Replace switch statement in setGraphicsLevel() mapping int constants to string
literals with static vector of level names, using same data for mapping as for
validating level numbers.
2013-06-28 15:26:18 -04:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07: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
Graham Madarasz 3c5ac77a92 For MAINT-2157 Codereview: DaveP 2013-02-07 09:02:51 -08:00
Dave Parks 954ebaed84 Automated merge with https://bitbucket.org/lindenlab/viewer-tiger 2013-01-08 13:40:59 -06:00
simon@Simon-PC.lindenlab.com 716e2ea3b1 Pull and merge viewer-development 2012-12-12 10:58:47 -08:00
Nat Goodspeed e1da5bda78 merge changes for DRTVWR-257 2012-12-05 18:18:16 -05:00
Dave Parks 1f2b88803e MAINT-1953 Run through viewer stats and update GPU table with missing entries and new expected OpenGL versions 2012-12-04 16:10:15 -06:00
Dave Parks e83700b56d MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people to update their drivers.
Reviewed by Simon
2012-11-30 17:03:12 -06:00
Dave Parks 73d1b4f79c MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
Reviewed by Simon
2012-11-26 13:22:25 -06:00
Dave Parks 4aa818055e MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
Reviewed by Simon
2012-11-26 13:22:25 -06:00
Dave Parks ccef9ab267 MAINT-2086 Separate GPU class from settings more completely to avoid GPU dependent behavior when manually adjusting detail slider. 2012-12-12 16:42:06 -06:00
Dave Parks fd3cbbaa27 MAINT-2090 Make gcc happy 2012-12-12 15:23:50 -06:00
Dave Parks e0bc069af2 MAINT-2090 Never enable lighting and shadows by default on OS X 2012-12-12 14:52:36 -06:00
Nat Goodspeed b6f0921099 Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased 2012-09-06 19:02:39 -04:00
Dave Parks 9611356556 MAINT-1491 Integration of statistically generated GPU table -- enable shadows by default where appropriate. 2012-08-28 13:52:14 -05:00
Dave Parks f5254d532b MAINT-1262 Fix for crash when setting graphics to Low 2012-07-12 16:53:31 -05:00
Dave Parks 513c1d9744 SH-795 Potential fix for crash after setting graphics detail to low. 2012-03-20 16:05:29 -05:00
Dave Parks 83e69659e2 MAINT-708 Add checkbox to hardware settings for controlling texture compression. Default texture compression to on for cards with 512MB of VRAM or less, off otherwise. 2012-03-08 15:22:56 -06:00
Dave Parks f5b10238af SH-2240 Forcibly disable shaders on hardware that's specifically flagged as unsupported. 2011-10-24 13:10:26 -05:00
Dave Parks 1762cc4939 SH-2570 Don't minimize viewer when reloading shaders (revert hack that didn't work) and pause shader loading until after all feature masks have been applied when switching detail levels 2011-10-20 14:20:12 -05:00
Richard Linden 25f1653ca0 EXP-1080 FIX Console gets spammed with VertexShaderEnable messages making the viewer unusable
converted LL_WARNS to LL_WARNS_ONCE
2011-08-11 14:21:20 -07:00
Dave Parks f1443579b3 SH-2038 Potential fix for a myriad of performance problems concering VBO usage. 2011-07-09 02:28:34 -05:00
Loren Shih 303a59e7bc dos2unix fixes for newview files. 2011-05-26 14:16:56 -04:00
Loren Shih 781addcbc1 Automated merge up from viewer-development into mesh-development 2011-05-20 11:41:28 -04:00
Leslie Linden 19a06478d9 SH-1618 FIX -- Lighting and shadows crash ATI macs
* Fixed ATI mac "lighting and shadows" related crash
* Fixed up numerous GL errors on macs related to multiple color formats,
  the use of glEnable/glDisable on textures above the texture unit count
  and old ATI-specific code that was not appropriate for Mac.
* Disabled SSAO for ATI macs due to it not working with shadows
* Ongoing work to properly get shadows and SSAO functioning on ATI macs is required.

Reviewed by davep
2011-05-19 17:28:23 -07:00
Oz Linden 5eb6cb8d86 merge up latest viewer-development (post mesh) 2011-05-18 07:33:08 -04:00
Oz Linden 27fd0d1a93 storm-1100: merged many more updates and refinements to table, added tester and files to test with 2011-05-13 13:27:56 -04:00
Leslie Linden 4268700fcf SH-1521 update -- Lighting and Shadows grayed out on mac
* Disabled SSAO on macs with 8 or less texture units.
* Slight cleanup of sunlight fragment shaders to remove unused texture units.

Reviewed by davep
2011-05-12 13:30:47 -07:00
Oz Linden 2eb19ccc13 STORM-1100 (diagnosis) improve logging to aid in debugging recognition errors 2011-04-15 20:46:31 -04:00
Dave Parks 5fd953df8f SH-874 Properly detect available video memory on ATI cards and disable vertex buffer objects when available vram is under 256MB. 2011-03-10 00:41:46 -06:00
Dave Parks 8f9edd3874 SH-534 Don't allow deferred rendering to be enabled on windows PC's with GL version less than 3.0. 2011-02-08 17:19:54 -06:00