livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,851 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

1062 Commits (d0a51da8942c1908ecad3f718cf620dafd96c511)

Author SHA1 Message Date
Nicky c913a301dd Reorder of enums for eMatrixMode, NUM_MATRIX_MODES must be last. 2014-06-14 02:21:47 +02:00
Nicky 4c7b79584d Cut back on logspam. 2014-06-11 22:35:30 +02:00
Tank_Master 6095a2072d more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL) 2014-06-10 08:01:16 -07:00
Nicky 46f4e82aab Workaround for broken code after merge. 2014-06-10 11:06:00 +02:00
Tank_Master 8863d9beaf Compile fixes 2014-06-09 23:27:05 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Nicky 72faa660f7 Remove old AMD/ATI fix for pink. It is for driver that predate 2009-12, with something as old as that, there will be a lot more issues than just pink textures. 2014-04-06 18:22:28 +02: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
Nicky c2fbeae724 FIRE-12968/FIRE-12929; Fix crash for AMD driver and random rendering artifacts. 2014-03-10 00:00:49 +01:00
simon 2ccebebece More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Tank_Master b28fd8c50d Merge 2014-02-08 14:19:19 -08:00
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08:00
simon 38915f119c More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
simon 4acc2dc273 Merge viewer-release 2014-02-10 15:42:25 -08:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Oz Linden 3c2b90514d merge 3.6.10-release 2013-11-11 16:19:35 -05:00
Richard Linden c35801ef1c fixed focus issue on inventory 2013-11-05 19:26:23 -08:00
simon b95935ccf3 Merge downstream code from viewer-bear 2013-10-30 11:25:08 -07: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
Xiaohong Bao 0c60e32808 Merge 2013-10-21 16:57:38 -06:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 1acceb3633 changed ll_aligned_(malloc|free) to take alignment size as a template argument 2013-10-14 10:18:41 -07:00
Dave Parks 0e116741a0 MAINT-2968 Fix for crash on AMD hardware running current drivers. 2013-10-10 18:00:11 -05:00
Dave Parks ff8b002c3b Quite down log spam from loading shaders. 
Up bone cap to 64 for rigged meshes.
 2013-10-10 13:56:06 -05: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 17df8988fe renamed TraceType to StatType 
added more MemTrackable types
optimized memory usage of LLTrace some more
 2013-10-07 13:38:03 -07:00
Richard Linden 754e8752a9 added initial memory usage tracking for lltrace 2013-10-03 14:30:34 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Richard Linden 12f0f8cb72 changed over to manual naming of MemTrackable stats 
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
 2013-10-01 13:46:43 -07:00
Graham Linden badb8a945d NORSPEC-259 revive fix stomped with materials->bear merge 2013-09-26 09:23:47 -07:00
Nicky 75451eaf5e Backout of 'Fix for newer glx.h header on Linux, those don't typedef GLXContextID anymore.'. Not necessary to solve it this way. 2013-12-08 18:12:26 +01:00
Nicky c33b1f0802 Fix for newer glx.h header on Linux, those don't typedef GLXContextID anymore. 2013-12-08 03:35:13 +01:00
Nicky 86830a3822 Merge. 2013-11-26 21:12:39 +01:00
Nicky 007ef6c7ec Fall back to render glyph '?' if given some invalid glyph_index 2013-11-26 21:11:05 +01:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08: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
Graham Linden 63757692b6 NORSPEC-362 Fix leak of deferred color attachments 2013-09-11 20:40:11 -07:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Graham Linden e8bd9afbe6 Merge viewer-release 3.6.5 Cocoa 2013-09-09 13:10:45 -07:00
simon e7ac4695e3 Merge viewer-release 2013-09-09 12:59:17 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro 
another attempt to move mem stat into base class
 2013-09-05 14:04:13 -07:00
Richard Linden a7aed07a5b broke out llunit.h into llunittype.h and llunits.h for unit declarations 
changed unit declarations macros to make a lot more sense
 2013-08-27 13:41:19 -07:00
Graham Linden 8675ed0491 Fix merge regressions from missed changes to LoD updates 2013-08-19 16:04:28 -07:00