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

153 Commits (fc971a2c8fb701e07825e1f0abb2c720d40e0bf2)

Author SHA1 Message Date
Ansariel a1fd8230bf Merge LL V3.7.12 2015-01-12 17:56:50 +01:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
simon a5a0a0b136 Merge downstream code 2014-04-21 12:48:50 -07:00
simon 33dfc0a8a1 Pull in downstream -bear, viewer-release and become version 3.7.5 2014-03-26 10:04:53 -07:00
Dave Parks 816e8578f9 Backed out changeset: d0dfe3cda5b1 2014-04-16 13:21:06 -05:00
maksymsproductengine 6f33f9090b MAINT-3827 FIXED crash in KDU texture decoding, likely out of memory 2014-03-20 19:21:52 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Xiaohong Bao fe73339840 fix for MAINT-2523: Bumpmaps don't load when Lighting & Shadows are enabled. 2014-02-18 17:19:24 -07:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -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 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 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Graham Linden 0a61606b79 NORSPEC-251 fix issues with binding unloaded standard bumpmaps 2013-06-14 14:39:18 -07:00
Dave Parks c3f14b915c NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric) 2013-06-03 12:50:48 -05:00
Graham Madarasz 7c72222823 NORSPEC-158 fix issues with loading of bumpmaps on clean install 2013-05-30 17:43:14 -07:00
Dave Parks 933d4c40f4 NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies. 2013-05-23 12:47:52 -05:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07: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 (Graham Linden) 7c242dae73 Fix Mac startup crash on unbind cube map if RenderDebugGL is on 2013-04-01 13:27:25 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07: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
Graham Madarasz (Graham) df08808640 Improve perf of GLSL uniform lookups by name 2013-02-28 09:33:41 -08:00
Graham Madarasz (Graham Linden) 34158130b4 Help the hg stop worrying about comment-only diffs 2013-02-21 16:54:36 -08:00
Graham Madarasz (Graham Linden) 2fd0e6e8f9 Merge viewer-cat and resolve conflict with alternate self 2013-02-21 16:50:04 -08:00
Graham Madarasz (Graham Linden) eb41cf7f76 For MAINT-755 Fix for unbinding cubemap causing false alarm in tex type checking code (OS X RenderDebugGL crash) Code review: Dav3p 2013-02-21 16:26:16 -08:00
Graham Madarasz (Graham Linden) e2f3ea50d5 For MAINT-1291 Re-order cubemap disable and shader tex disable to avoid false alarm when using RenderDebugGL. Code Review: DaveP 2013-02-14 10:57:28 -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
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
Richard Linden 93578f7e51 Automated merge with http://bitbucket.org/lindenlab/viewer-cat 2012-08-24 16:31:29 -07:00
Richard Linden a98c7e150b llfasttimer cleanup 
removed unnecessary cache miss from fast timers
renamed llfasttimer_class back to llfasttimer
 2012-08-06 16:08:04 -07:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Tank_Master b7c25b12e2 Partial merge of LGPL repo 2013-02-20 01:48:25 -08:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
PanteraPolnocy d00f764e2a Attempt to speed up things a little 2013-01-13 23:08:22 +01:00
Tank_Master 93d4b47252 Merge LL 3.4.1 beta 10 2012-10-26 09:59:19 -07:00
Dave Parks 1ba00693c7 reapply 38b7779af5f9: MAINT-646 Faster traversal of render batch lists. 2012-09-20 09:48:51 -04:00
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
Ansariel 31752c6a10 Use faster LLCachedControls for frequently visited locations 2012-09-23 14:07:26 +02:00
Dave Parks 096fe03786 MAINT-646 Faster traversal of render batch lists. 2012-06-01 14:27:04 -05:00
Dave Parks f53fa08c70 MAINT-708 Use texture compression to minimize memory bloat (experimental) 2012-03-02 13:35:10 -06:00
Dave Parks 2b2a03b3c5 SH-2511 Fix for bumpmapped objects flickering. 2011-12-12 17:12:47 -06:00
Dave Parks 428b74f14b SH-2652 Fix for black bands in high-res normal maps (break normal map generation up into tiles to handle the case where a normal map is higher resolution than the current window) 2011-11-08 13:11:29 -06:00
Dave Parks dfe75ba0eb SH-2610 Fix for black terrain when bump map is visible and shaders are not supported. 2011-10-24 12:35:53 -05:00