Commit Graph

149 Commits (e52d57cba26ba1dfce6f28b31e531eaed1a965a6)

Author SHA1 Message Date
Ansariel e52d57cba2 Merge LL V3.7.23 2015-01-15 15:44:43 +01:00
ruslantproductengine d47efdfe03 MAINT-3964 FIXED Textures with Alpha won't Animate on Rigged Mesh when worn : fix in shader (mul texcoord to tex matrix), array's optimization 2014-09-10 21:08:08 +03:00
Tank_Master 6095a2072d more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL) 2014-06-10 08:01:16 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Nicky 8c91463476 FIRE-12968; Even though the root cause is likely the shader memory overrun, preseed the VBO pools to take some strain from the driver. Remove the LLStrider changes while at it, those are not used in the Havok version and have not triggered anything in the OS version since month. 2014-03-10 00:45:41 +01:00
Mnikolenko ProductEngine 021dba83af MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader). 2013-10-30 14:26:11 +02:00
Ansariel 962f90dbbb Backed out changeset 577f38970ed9 - Fix coming up... 2014-02-07 07:59:41 +01:00
Tank_Master 28b1297e50 Backed out changeset: 54055f06639f - causes FIRE-12858
-disabling Basic shaders now makes the UI practically unusable
2014-02-06 19:40:34 -08:00
Mnikolenko ProductEngine dfa6822b34 MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader). 2013-10-30 14:26:11 +02:00
Dave Parks 7fdf010d6a Fix for random bad colors in UI on Intel HD 4000 2013-10-08 14:43:10 -05:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Graham Linden 71e986b059 NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback 2013-09-23 14:49:10 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Dave Parks 0ab4e11223 Fix for random bad colors in UI on Intel HD 4000 2013-10-08 14:43:10 -05: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
Dave Parks d6d2f74fbb NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup. 2013-07-01 16:27:20 -05:00
Dave Parks 7df863265f NORSPEC-290 Shader optimization WIP -- remove a couple normalizes, pows, and divides from various lighting functions. 2013-06-28 13:32:01 -05:00
Dave Parks 380785e613 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-27 16:16:56 -05:00
Graham Linden c603eb5ece MAINT-318 prevent crashes from incomplete quads and lines and prevent drivers from crashing to desktop when passed short buffers 2013-06-17 08:03:32 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Xiaohong Bao c978364e1e for SH-4133: create a debug tool to show textures in active fetching 2013-04-22 22:11:41 -06:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Dave Parks 586025bde5 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-03-04 18:06:29 -06:00
Dave Parks 609ed855e1 MAINT-2371 More optimizations.
Reviewed by Graham
2013-03-04 18:01:42 -06:00
Graham Madarasz (Graham) 4e81a84abd Performance improvements. Faster threadsaferefcount, faster instancetracker, use hashtable and pre-hashed strings for GLSL uniform lookup, and use dup_handles curl interface to avoid re-initing ares resolvers expensively. 2013-03-04 08:57:58 -08:00
Dave Parks f5e5396c3a MAINT-2371 First set of profile guided optimizations.
Reviewed by Graham
2013-02-26 15:15:08 -06:00
Graham Madarasz (Graham Linden) 2fd0e6e8f9 Merge viewer-cat and resolve conflict with alternate self 2013-02-21 16:50:04 -08:00
Dave Parks f67087b872 MAINT-2370 Add debug setting "RenderAutoMuteRenderCostLimit" that automatically visually mutes avatars above a certain threshold (adjusted by Avatar Mesh Detail Slider) 2013-02-20 19:30:46 -06:00
Tank_Master 119ce81029 Merge viewer bear updates + merge fixes 2013-09-23 22:10:59 -07:00
Tank_Master 0c314a0e6f Merge LGPL 2013-09-21 16:59:50 -07:00
Tank_Master 05ad3a1c29 Merge Viewer-bear (merge of materials + fixes) to FS-exp 2013-09-21 11:44:46 -07:00
Tank_Master 5519c39beb Merge Viewer-bear (Materials 3.6.6 RC) 2013-09-16 16:18:33 -07:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Nicky af17cbce9f Forgot the #ifdefs for the Havok enabled version, so setCount of llstrider is only called on non Havok builds. 2013-04-20 03:31:54 +02:00
Nicky 6bfe9a8686 Protect VBOs against buffer overflows: Need to set striders to their correct size. 2013-03-26 23:00:35 +01:00
Nyx Linden 49caededb4 BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa 2012-09-19 17:05:56 +00:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 9f4245779c Partial Merge of LL 3.4.2 Release 2012-12-10 15:56:46 -08:00
Dave Parks d1c056beba MAINT-685 Fix for disabling basic shaders making high detail terrain render incorrectly. 2012-07-03 14:35:08 -05:00
Dave Parks bedbbf7c02 Merge 2012-06-28 16:32:54 -05:00
Tank_Master cb24ec2e0d merge LL 3.3.4 beta
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Dave Parks e3a5125b41 MAINT-616 Potential fix for corrupted mip maps. 2012-05-25 17:58:12 -05:00
Tank_Master 991d43709c merge LL 3.3.3 beta 2012-06-16 07:22:27 -07:00