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

206 Commits (8243d30f02abd56dc2abdc1925f16ccf81fbbb49)

Author SHA1 Message Date
Ansariel 9c54c976a0 Merge cleanup in llface.cpp 2013-01-04 19:09:11 +01: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
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
Dave Parks 7fc702dc49 reapply 04fdf7945708: MAINT-775 Fix for particle index pool corruption on teleport. 2012-09-20 10:00:58 -04:00
Dave Parks b5e71964e5 reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes. 2012-09-20 10:00:56 -04:00
Dave Parks cf98064700 reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree 2012-09-20 09:48:55 -04:00
Brad Payne (Vir Linden) d52c1c1c68 Fixing merge conflicts related to restoring DRTVWR-167 changes 2012-09-12 16:37:13 -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
Brad Payne (Vir Linden) 58d5e223b8 merge 2012-07-30 15:02:02 -04:00
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
Tank_Master 93d4b47252 Merge LL 3.4.1 beta 10 2012-10-26 09:59:19 -07:00
Dave Parks 93a04479d2 reapply 04fdf7945708: MAINT-775 Fix for particle index pool corruption on teleport. 2012-09-20 10:00:58 -04:00
Oz Linden 3803a5b5ae pull back fixes for 3.3.4-beta4 2012-07-17 13:21:36 -04:00
Dave Parks ccac47c1a7 MAINT-1223 Fix for alpha updates not triggering LoD updates. 2012-07-16 14:31:15 -05:00
Oz Linden 509408f393 merge back beta fixes for DRTVWR-180 2012-07-14 09:30:09 -04: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 997b360747 MAINT-794 Fix for assert on loading some types of objects before their parents. 2012-07-11 15:17:13 -05:00
Xiaohong Bao 266209b6a3 trivial: convert to Unix line endings. 2012-07-06 14:44:50 -06:00
Oz Linden 2c3e78f1f1 merge changes for DRTVWR-167 2012-06-27 14:18:22 -04:00
Dave Parks a1d0d67e05 MAINT-775 Fix for particle index pool corruption on teleport. 2012-06-15 16:07:06 -05:00
Dave Parks 93fcff2b24 MAINT-646 Cleanup some warnings from previous changes. 2012-06-14 14:54:54 -05:00
Xiaohong Bao 52411f83a1 fix for MAINT-758: [PUBLIC]texture discard level is inconsistent between sessions 2012-06-14 12:01:21 -06: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 8d95b1865e Merge LL 3.3.4 release 2012-07-24 18:38:28 -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
Dave Parks 92ee373e45 MAINT-646 Factor std::set out of lloctree 2012-06-05 12:55:17 -05:00
Brad Payne (Vir Linden) 542975b4c6 merge 2012-06-04 16:19:18 -04:00
Brad Payne (Vir Linden) 6ee0456220 merge 2012-06-04 15:28:08 -04:00
Dave Parks defbd61d31 MAINT-639 Fix for random rainbow effects on some prims. 2012-05-31 13:25:19 -05:00
Nicky fdb0218bfc Crashfix; Guard against 0 pointer textures. 2012-10-22 15:40:18 -04:00
Xiaohong Bao 957bfcd5d9 fo SH-3074: clear ghost and stale texture fetching requests in time. 2012-05-29 18:02:11 -06:00
Dave Parks 6fe9b45db2 Fix for linux build. 2012-05-22 00:03:56 -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
Nicky ae4b1e4e2f Crashfix; Guard against 0 pointer textures. 2012-07-21 14:54:43 +02:00
Oz Linden fa6add3fcd merge changes for drtvwr-132 2012-04-03 11:28:56 -04:00
Oz Linden 38ad8611c9 MAINT-710: Fix for VertexBufferStrider could not find valid vertex data. (from Firestorm) 2012-03-27 10:55:15 -04:00
Armin Weatherwax 2b9061365a comment out some llasserts which make debug builds unusable on opensim 2012-06-11 10:54:26 +02:00
Tank_Master 1c55d5cbb6 Merge LL 3.3.2 release 2012-05-28 17:02:11 -07:00
Dave Parks 423659c680 MAINT-775 Particle vertex buffer management optimizations 2012-05-02 15:45:38 -05:00
Nat Goodspeed 0249a0d1e7 Automated merge with http://hg.secondlife.com/viewer-release 2012-04-26 14:07:09 -04:00
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
Dave Parks 3710c6110d SH-2908 Rework indexed texture rendering to use a uvec4 instead of a float for texture indices in the data stream. Also rework gl_FragColor overrides to not collide with some odd driver implementations. 2012-02-10 20:04:19 -06:00
Brad Payne (Vir Linden) 635a264e6f merge 2012-02-08 11:22:52 -05:00
Nicky 043beaf7ee FS-5132; only use color strider if face has colors. 2012-02-27 22:16:13 +01:00
Dave Parks 0c1fc78bd9 SH-2794 Map buffer now performs as well as buffersubdata 2012-01-18 12:40:11 -06:00
Brad Payne (Vir Linden) c0fffdea88 SH-2789 WIP 2012-01-12 16:11:06 -05:00
Nicky 9f7c9cffa3 Merge up to 26380 / 19ccfae26929 (V/dev tip). 2012-02-02 19:38:24 +01:00