Commit Graph

25458 Commits (5bbc33383ed63d4d0c8a4241c8274b32fa5b22cc)

Author SHA1 Message Date
Tonya Souther 5bbc33383e Don't spam the sim with repeated queries for an empty list of materials. 2013-02-03 23:01:22 -06:00
Tonya Souther da82358116 Enable sending material updates. 2013-02-03 23:00:37 -06:00
Kitty Barnett d149aea87c Merged with viewer-dev-materials 2013-02-04 01:01:07 +01:00
Kitty Barnett 0a99aadd7a Material PUT queue entries aren't removed after a request is sent 2013-02-04 00:57:45 +01:00
Tonya Souther 132db13fb6 Fixing VC++ compile error: calling a static routine doesn't need the "this" pointer 2013-01-31 14:49:11 -06:00
Tonya Souther c1b110dd1d Merging in main repository. 2013-01-31 11:40:16 -06:00
Oz Linden d1b224158d merge workaround for llprocess test failures 2013-01-31 10:34:30 -05:00
Oz Linden dfc3faf240 workaround by skipping llprocess tests that frequently fail on Windows 2013-01-31 10:33:39 -05:00
Oz Linden e7ba74b9ea merge workarounds for failing tests 2013-01-31 10:22:44 -05:00
Oz Linden 5ade41c09d disable timing sensitive check in the pipe and pump fitness test 2013-01-31 09:34:00 -05:00
Oz Linden e8d38f7885 skip some http core tests on Windows because they fail too frequently 2013-01-31 08:42:10 -05:00
Tonya Souther d53f69b67f Control reorganization and bugfixes. 2013-01-31 00:36:23 -06:00
Geenz 071a53c814 Merge with latest viewer-dev-materials. 2013-01-30 12:45:26 -05:00
Geenz aa1befd689 Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry. 2013-01-30 12:17:04 -05:00
Oz Linden 577515e93f merge build floater updates 2013-01-30 10:30:17 -05:00
Oz Linden 2968478a6a merge MAINT-2252 fix 2013-01-30 10:25:29 -05:00
Tonya Souther ada2d07572 Compile fix for potentially uninitialized variable. 2013-01-29 22:12:20 -06:00
Tonya Souther 1751c965ba Editing interface for normal and specular maps and other parameters. 2013-01-29 21:19:58 -06:00
Geenz 66a01ba4c5 Basic normal mapping support. 2013-01-28 19:56:18 -05:00
Oz Linden d56de96086 merge linearlize lighting 2013-01-28 16:22:21 -05:00
Oz Linden 6c667b8c33 rename "Lighting and Shadows" (deferred rendering) to "Advanced Lighting Model" 2013-01-28 16:20:52 -05:00
Geenz 97f9ab80f9 setMaterialParams for LLViewerObject 2013-01-25 18:45:40 -05:00
Geenz 5f03e197f4 Trying to set materials up for rendering! Yay! 2013-01-25 17:54:38 -05:00
Geenz cc7ae8fbd1 Linearize light source colors, and a bit of cook torrance fanciness. 2013-01-25 17:53:43 -05:00
Oz Linden d12627d8f7 merge changes for open-161 2013-01-22 14:45:22 -05:00
Dave Parks dd75537283 MAINT-2252 GPU Table update 2013-01-22 12:08:37 -06:00
Jonathan Yap 30b48351f9 OPEN-161 Typo in the header guard. 2013-01-16 19:19:19 -05:00
Oz Linden 1378d4407f merge changes to remove prototype test code 2013-01-16 17:44:38 -05:00
Oz Linden 8a576ea16f remove prototype access code used for server testing 2013-01-16 17:28:30 -05:00
Oz Linden 53d133cd55 merge initial object fix 2013-01-14 13:03:11 -05:00
Tonya Souther ca1f57307a Initialize correctly for new objects. 2013-01-11 22:12:18 -06:00
Oz Linden 7d56fb04df merge gamma correction rendering 2013-01-11 18:52:27 -05:00
Oz Linden 597b374f38 merge first round of build floater changes 2013-01-11 18:51:28 -05:00
Oz Linden b3e10f0f49 pull 3.4.4-release tag 2013-01-11 10:13:56 -05:00
Geenz de0863ed6e Linearize spotlight textures. 2013-01-11 07:19:27 -05:00
Geenz eda11a25a4 Initial (largely complete) gamma correct rendering implementation. 2013-01-11 06:37:21 -05:00
Tonya Souther f4663e098c New controls for editing media. 2013-01-10 18:05:39 -06:00
Oz Linden d16757545c Added tag 3.4.4-release for changeset e1bb1ae7d8b1 2013-01-09 18:19:24 -05:00
Oz Linden 896a2d3651 merge up to 3.4.4-beta4 2013-01-09 16:55:34 -05:00
Geenz e8f6734d67 Merge 2013-01-07 12:34:19 -05:00
Oz Linden 8b78b9960a add conditional to suppress unused variable warning in Release builds 2013-01-04 14:12:05 -05:00
Oz Linden fde976cf2b Added tag 3.4.4-beta4 for changeset 05d9f1dd7a95 2013-01-04 14:09:03 -05:00
Oz Linden def472b45c tag merge of DRTVWR-275 2013-01-03 18:12:29 -05:00
Oz Linden 80b734575d merge up to 3.4.4-beta3, new havok license, and new boost and icu4c builds 2013-01-03 17:32:49 -05:00
Oz Linden 0b1d70fd71 whitespace change to force new codeticket 2013-01-03 16:36:39 -05:00
Oz Linden d4910e15a6 changes needed to compile with Linden-standard toolchain 2013-01-03 14:14:43 -05:00
Kelly Washington 2cba564b24 MAINT-2184 [crashhunters] new crash in LLUUID::toString
Fix dangling references.
2013-01-03 09:17:25 -08:00
Oz Linden 835660bbb2 merge changes for DRTVWR-273 2012-12-25 09:00:49 -05:00
Oz Linden 4364924ee4 tag merge of DRTVWR-273 2012-12-25 09:00:42 -05:00
Oz Linden 0baf43730b Added tag 3.4.4-beta3 for changeset 2f8a3ef687bc 2012-12-20 15:34:18 -05:00