Commit Graph

19985 Commits (2dd8ce53e4e0d14f2bc20796eb6bdf1ef12a65df)

Author SHA1 Message Date
Dave Parks 2dd8ce53e4 SH-2242 FXAA support instead of unreliable multisample textures (done here because it's a smaller change than integrating glVertexAttrib with FSAA pipe). Shader integration with LLDynamicTexture subclasses. 2011-08-11 14:19:58 -05:00
Dave Parks 364f8771ed Merge cleanup. 2011-08-10 15:34:48 -05:00
Dave Parks 265db1f17c merge 2011-08-10 14:50:11 -05:00
Dave Parks db92b03691 SH-2242 Start using "no fixed function" when rendering dynamic textures. 2011-08-10 14:49:11 -05:00
Dave Parks 17f46868d2 SH-2265 Fix for impostor alpha masking being broken. 2011-08-10 14:40:39 -05:00
Dave Parks 5e87957e05 Remove zip file that was accidentally added 2011-08-10 13:02:14 -05:00
Dave Parks 2ee8154780 SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed). 2011-08-10 13:01:14 -05:00
Dave Parks f076bdf609 merge 2011-08-08 15:39:02 -05:00
Dave Parks f302e11962 merge 2011-08-08 15:33:55 -05:00
Dave Parks b9439ac006 merge 2011-08-08 15:30:34 -05:00
Dave Parks 14f6bbadef SH-2242 Work in progress migrating to glVertexAttrib everywhere 2011-08-08 15:29:23 -05:00
Oz Linden 4ab5831b3e increment viewer version to 3.0.1 2011-08-08 11:13:15 -04:00
Oz Linden 1722790ab6 Added tag 3.0.0-start for changeset 6b678ea52f90 2011-08-08 11:08:53 -04:00
Oz Linden 8053f7a5b0 correct xml syntax error 2011-08-08 11:08:33 -04:00
Oz Linden 7c7038136e correct version number typo 2011-08-08 10:58:52 -04:00
Oz Linden f30680cce9 correct merge-induced error in settings.xml 2011-08-08 10:56:32 -04:00
Oz Linden 09dc3fd81b merge back beta tags 2011-08-08 10:08:22 -04:00
Oz Linden 33fa30f526 merge back release tag 2011-08-08 10:06:12 -04:00
Oz Linden fb2733942c increment viewer version to 3.0.0 2011-08-08 09:16:01 -04:00
Oz Linden 0d085e90ac merge changes for storm-1060 2011-08-08 09:14:36 -04:00
Debi King (Dessie) 8c5da0552d merged .hgtags 2011-08-05 19:09:28 -04:00
Debi King (Dessie) 8675901fa8 Added tag DRTVWR-75_2.8.3-beta1, 2.8.3-beta1 for changeset 599677276b22 2011-08-05 19:07:06 -04:00
Xiaohong Bao 5e22062b68 fix for SH-2215: [crashhunters] crash at LLPluginClassMedia 2011-08-05 16:02:05 -06:00
Oz Linden d456006f9a remove override for channel testing 2011-08-05 16:23:31 -04:00
Oz Linden 38e18cd69c undo Mac app name change (again) 2011-08-05 13:28:29 -04:00
Vadim ProductEngine 24f88cfe19 Merging STORM-565 2011-08-05 19:30:12 +03:00
Oz Linden a3a7861874 undo Mac app name change 2011-08-05 11:59:57 -04:00
Oz Linden 0c2e949c6c change parameters to test build for release 2011-08-05 10:18:02 -04:00
Oz Linden e3114a8695 remove parameter used in test builds 2011-08-04 19:31:50 -04:00
Oz Linden 812ad1b679 merge changes for SH-2218 2011-08-04 18:58:21 -04:00
Oz Linden 7740691bf9 merge changes for SH-2218 2011-08-04 18:57:19 -04:00
Debi King (Dessie) 6c61a53791 Added tag DRTVWR-72_2.8.1-release, 2.8.1-release for changeset 29e93d7e1999 2011-08-04 17:28:43 -04:00
Oz Linden aeb1f944aa storm-1060 : add windows (thanks Kadah and Michelle), remove some files I think are no longer used 2011-08-04 16:52:19 -04:00
Oz Linden f42df4cd9f merge changes for storm-1538 2011-08-04 15:39:33 -04:00
Oz Linden 94c171d89b merge changes for storm-1355 2011-08-04 15:37:31 -04:00
Oz Linden 4ba18501ea merge changes for storm-1458 2011-08-04 15:36:26 -04:00
Oz Linden 57fec33490 merge changes for storm-1291 2011-08-04 15:30:11 -04:00
Oz Linden 5aa1521625 fix path choice for project branches, attempt to fix linux icon 2011-08-04 11:52:32 -04:00
Oz Linden 1b46240ed8 correct default channel 2011-08-04 11:14:18 -04:00
Oz Linden 7714f05e62 merge back disabling of watchdog 2011-08-04 11:13:30 -04:00
Oz Linden 9963e9aaac fix license headers 2011-08-04 11:00:53 -04:00
Oz Linden 3369ebc8dd fix DOS line endings 2011-08-04 10:57:03 -04:00
Oz Linden ca3cea390c merge changes for storm-1537 : releasable mesh branch 2011-08-04 09:12:08 -04:00
Oz Linden 2fcf7bc6d7 storm-1060 (temporary) adjust build params for icon selection test 2011-08-04 09:01:36 -04:00
Oz Linden 4877bb536e storm-1060 (partial) : update icon selection for Mac and Linux builds 2011-08-04 08:52:32 -04:00
Leslie Linden 017a23aaf4 SH-2218 WORK AROUND -- v2.8.x Viewers crash consistently when I actively use other applications
* Just removed mac memory stats to make a low-risk work-around.
2011-08-03 17:07:49 -07:00
Xiaohong Bao 13e152c92d fix for SH-2177: Second Life Crashes On Startup in Advanced Mode -- I have reinstalled SL, Clear Caches -- Nothing Works 2011-08-03 14:54:53 -06:00
Oz Linden 299e18e588 Automated merge with file:///Users/oz/Work/V-PR 2011-08-03 14:13:12 -04:00
Oz Linden 1d9fe077a6 re-re-re-enable watchdog 2011-08-02 19:40:44 -04:00
Oz Linden 63fe879065 merge back late beta fixes 2011-08-02 19:39:44 -04:00