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

25787 Commits (74b5bfb98f0496a8e1519c4732bb5942e6fcc78a)

Author SHA1 Message Date
Dave Parks 74b5bfb98f Automated merge with https://bitbucket.org/lindenlab/davep-materials 2013-03-27 22:01:56 -05:00
Dave Parks 4f8827d2a8 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-03-27 21:59:52 -05:00
Dave Parks 6300f4f768 NORSPEC-61 Hook up material parameters to shaders. 2013-03-27 21:59:14 -05:00
Graham Madarasz f0c2f99c25 New gmock with WChar fix and add boost sys lib to viewer source tests 2013-03-27 19:09:01 -07:00
Graham Madarasz (Graham Linden) 0ebfcce8ff Update to newest breakpad candidate packages with fixed headers 2013-03-27 14:34:10 -07:00
Maestro Linden a4510f5b1c NORSPEC-56 Added some extra details to debug logs for RenderMaterials cap access. Reviewed by Graham. 2013-03-27 17:50:26 +00:00
Graham Madarasz (Graham Linden) caa0eb994c Revert previous change because breakpad's ExceptionHandler class has different API on diff platforms 2013-03-27 09:11:34 -07:00
Graham Madarasz (Graham Linden) 84d6cdf643 Fix use of breakpad ExceptionHandler on windows 2013-03-27 08:02:53 -07:00
Graham Madarasz 3c486da165 Rollback the boost sys lib inclusion in integ tests as it was causing dup symbols 2013-03-27 07:38:46 -07:00
Graham Madarasz a83289f01f Fix API diffs with new breakpad and point at private breakpad packages to test 2013-03-27 05:50:55 -07:00
Dave Parks 7be396cc98 NORSPEC-60 Fix for bloom on all shiny surfaces. 2013-03-26 17:49:41 -05:00
Dave Parks c107afcb1e NORSPEC-57, NORSPEC-58 Remove sRGB and gamma correction from shaders to remove banding and not break all shiny objects. 2013-03-26 16:23:49 -05:00
Dave Parks ae9604acd5 Backed out changeset: 3643d1c655c0 2013-03-26 12:32:29 -05:00
Graham Madarasz (Graham) b9db8d4813 Fix linux breakpad package URL 2013-03-26 09:26:24 -07:00
Graham Madarasz (Graham) 6503d6d843 Merge 2013-03-26 09:17:18 -07:00
Graham Madarasz (Graham) 0560a8c457 Point at private breakpad packages to get builds working again 2013-03-26 09:16:22 -07:00
Oz Linden 4da3467961 Add Boost System library to all tests 
I don't know what added this requirement, but this last night lots of
them started failing to link.
Also remove some obsolete commented-out stuff
 2013-03-26 10:33:02 -04:00
Dave Parks 41ca92c67c NORSPEC-54 Potential fix for crashing on all sorts of random operations. 2013-03-25 18:27:07 -05:00
Tonya Souther 6620c1f824 Don't set shiny/bumpy texture pickers to NULL unless not editable. 2013-03-14 11:44:09 -05:00
Tonya Souther 8b24857f6a Dynamically add and remove "Use texture" normal/specular setting. 2013-03-09 16:11:55 -06:00
Oz Linden fd6147cdb6 merge changes for grouping materials requests 2013-03-04 16:59:39 -05:00
Oz Linden e247336a03 fix Linux warning/error 2013-03-04 14:06:18 -05:00
Oz Linden 90536f6cdf protect against missing mNormalMap or mSpecularMap 2013-03-01 17:34:03 -05:00
Oz Linden 3c65f7fef0 merge fix for unit test problem with some python configurations 2013-03-01 15:47:50 -05:00
Oz Linden e44c097aee merge changes for ui fixes 2013-03-01 12:56:50 -05:00
Oz Linden 89816222d2 change channel name to new convention 2013-03-01 12:56:20 -05:00
Oz Linden fd96fe41a6 remove use of system llbase module in integration tests; always use the one from this tree 2013-03-01 11:41:33 -05:00
Kitty Barnett 7a3a74b3d4 Group multiple material PUT requests together and throttle requests to the region 2013-02-28 23:42:12 +01:00
Kitty Barnett 5ba7be0812 Mark a material as 'pending' from the very first call to LLMaterialMgr::get() 2013-02-28 23:19:41 +01:00
Tonya Souther 2eaf35b946 Clear face's material ID internally when removing the material. 2013-02-28 07:44:45 -06:00
Tonya Souther fa7dd43308 Wire up LLMaterialMgr::remove() to edit panel. 2013-02-27 19:27:46 -06:00
Oz Linden 8397f62059 force new codeticket number 2013-02-27 13:19:50 -05:00
Kitty Barnett e71de8619e Fixed GCC compiler error in previous changeset 2013-02-25 20:06:46 +01:00
Kitty Barnett c970cb0283 Added "Selected Material Info" menu option to query basic material information about the current selection 2013-02-25 16:19:35 +01:00
Kitty Barnett fbf8e51c60 Added LLMaterialMgr::remove() to remove material information from a face 2013-02-25 00:16:14 +01:00
Kitty Barnett 4d1446766a Merge stray fix for infinite "get all" request loop on non-material regions 2013-02-24 23:42:53 +01:00
Oz Linden 5711bda96a clean up some debug logging, add comment on llassert 2013-02-20 12:03:29 -05:00
Oz Linden 372f3d66ff merge changes for material data overrun 2013-02-20 10:15:20 -05:00
Kitty Barnett a6e8e60f50 Don't overrun the message buffer extracting materials ids when the region isn't sending them 2013-02-19 21:21:41 +01:00
Kitty Barnett b4a87776d4 Prevent a failed GET from causing an infinite material request loop when there are still pending POST requests for the same region 2013-02-18 19:37:19 +01:00
Oz Linden 1b4a585af6 merge latest rendering fixes 2013-02-15 18:35:34 -05:00
Oz Linden 64a4a13397 fix crasher in setNumTEs 2013-02-15 15:40:43 -05:00
Geenz ec3b4e05a4 Merge with latest viewer-dev-materials. 2013-02-15 11:52:18 -05:00
Geenz c2785a740e Fixed: alpha mode shaders not being bound appropriately. 2013-02-15 11:49:59 -05:00
Oz Linden b7cd89da5f change to force new codeticket number 2013-02-12 16:43:16 -05:00
Oz Linden 2bcfc9554d remove obsolete LLMemType tracing from materials 2013-02-12 14:38:47 -05:00
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -05:00
Oz Linden 66c75202a8 merge renderer update fix 2013-02-12 13:10:11 -05:00
Oz Linden e87000ba07 Added tag 3.4.5-release for changeset a49c715243a3 2013-02-12 07:06:24 -05:00
Tonya Souther 3422f75cf7 Tell the renderer to use the updated material immediately on editing it. 2013-02-06 21:38:05 -06:00