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

199 Commits (0d4ecdefa4ac032e2951c8befca0e21d216fd554)

Author SHA1 Message Date
Nicky 0d4ecdefa4 Protect VBOs against buffer overflows. 2013-03-25 16:19:47 +01:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -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
Tank_Master cc44316aed Merge LL 3.4.3, 
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
 2012-12-18 00:36:35 -08:00
Tank_Master 5b5f4c8bf5 Merge LL 3.4.2 release, 
broken revision, KDU package needs updating, mac packager also likely broken
 2012-12-14 07:59:55 -08:00
Tank_Master 9f4245779c Partial Merge of LL 3.4.2 Release 2012-12-10 15:56:46 -08:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
simon@Simon-PC.lindenlab.com d6e3b0445a Merge in viewer-development code and fix build 2012-10-15 14:23:29 -07:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Don Kjer 19e43e4b58 Added fast timers for baked texture rendering. Updated appearance utility 2012-10-06 08:08:52 +00:00
William Todd Stinson c6a2ac0489 Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179. 2012-09-20 19:43:54 -07:00
Nyx Linden 49caededb4 BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa 2012-09-19 17:05:56 +00: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
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07:00
Nicky 2b620b006b Disable caching of vbo memory in LLVBOPool. Had been there once and it was a memory hog, now it's back and it's again keeping massive amounts of memory 2012-11-02 00:05:28 +01:00
Oz Linden 509408f393 merge back beta fixes for DRTVWR-180 2012-07-14 09:30:09 -04:00
simon@Simon-PC.lindenlab.com 56d563ba7f Fix merge issues - duplicate insertions of code 2012-07-11 17:14:25 -07:00
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07:00
Dave Parks e86b1c18db MAINT-794 Fix for assert on loading some types of objects before their parents. 2012-07-11 15:17:13 -05:00
Dave Parks 997b360747 MAINT-794 Fix for assert on loading some types of objects before their parents. 2012-07-11 15:17:13 -05:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Nicky b43e29ee66 Reapplied after merge: Fix for GCC 4.6.3 when compiling 64 bit. 2012-06-10 23:13:50 +02:00
Nicky c1e6caf23a Backed out changeset 0cb6e34b68e5. Talked with Tonya, this needs a slightly different fix. 2012-10-14 22:02:33 +02:00
Tonya Souther a88d1372ee Pass the address of an array element to a function expecting a pointer. 2012-10-14 14:09:48 -05:00
Nicky 034cbbdc95 User-defined names was deprecated with OpenGL 3.1. Just generate/delete using OpenGL function. 2012-09-26 21:00:25 +02:00
Tank_Master 999bd2130e Merge LL 3.4.0 release 2012-09-13 15:19:30 -07:00
Tank_Master d9c7b9253d merge LL 3.4.0 viewer-beta 2012-08-31 00:18:30 -07:00
Tank_Master 8cb09ca444 Merge to FS LGPL 29865 2012-08-30 15:45:02 -07: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
Aura Linden 0fd3ff972d MAINT-1142 use VBO pooling on OSX 2012-06-04 12:15:08 -07:00
Nicky e0b334c615 Crashfix; Change llassert_always to llassert + llwarns. This way users don't get disruptive crashes. 2012-07-21 14:18:10 +02:00
Dave Parks 67221663fe MAINT-616 Fix for mac build. 2012-05-30 14:55:34 -05:00
Dave Parks 2e26dc3971 Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix VBO accounting. 2012-05-30 13:22:04 -05:00
Dave Parks efda0814cb MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback. 2012-05-24 10:50:48 -05:00
Dave Parks 78df56e1b5 MAINT-616 Fix for crash on teleport from previous changes 2012-05-22 13:49:52 -05:00
Dave Parks 534168c452 MAINT-616 Fix for crash on shutdown caused by previous changes. 2012-05-22 00:49:07 -05:00
Dave Parks b7cfd8c7f0 MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update 2012-05-21 23:33:25 -05:00
Dave Parks 89b0b6ac71 MAINT-616 Different VBO Pooling scheme -- populate VBO pool with buffers that are likely to be requested, but never reuse a previously used buffer. 2012-05-15 16:42:04 -05:00
Nicky aca20e85fb Crashfix; Change llassert_always to llassert + llwarns. This way users don't get disruptive crashes. 2012-07-21 14:18:10 +02:00
Dave Parks 3894701180 MAINT-708 Fix for pink when enabling RenderUseVAO 2012-03-14 16:13:23 -05:00
Dave Parks 3953477ee5 MAINT-708 Reduce amount of video memory consumed by vertex buffer objects. 2012-03-13 17:34:11 -05:00
Tank_Master 991d43709c merge LL 3.3.3 beta 2012-06-16 07:22:27 -07:00
Tank_Master 1c55d5cbb6 Merge LL 3.3.2 release 2012-05-28 17:02:11 -07:00
Dave Parks 4f26a67c0f MAINT-708 Fix for pink when enabling RenderUseVAO 2012-03-14 16:13:23 -05:00
Dave Parks 2e1067dd32 MAINT-708 Reduce amount of video memory consumed by vertex buffer objects. 2012-03-13 17:34:11 -05:00
Dave Parks a128836ded SH-2908 Fix for linux build. 2012-02-23 13:41:19 -06:00