summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-27Automated merge with https://bitbucket.org/lindenlab/davep-materialsDave Parks
2013-03-27Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-03-27NORSPEC-61 Hook up material parameters to shaders.Dave Parks
2013-03-27New gmock with WChar fix and add boost sys lib to viewer source testsGraham Madarasz
2013-03-27Update to newest breakpad candidate packages with fixed headersGraham Madarasz (Graham Linden)
2013-03-27NORSPEC-56 Added some extra details to debug logs for RenderMaterials cap ↵Maestro Linden
access. Reviewed by Graham.
2013-03-27Revert previous change because breakpad's ExceptionHandler class has ↵Graham Madarasz (Graham Linden)
different API on diff platforms
2013-03-27Fix use of breakpad ExceptionHandler on windowsGraham Madarasz (Graham Linden)
2013-03-27Rollback the boost sys lib inclusion in integ tests as it was causing dup ↵Graham Madarasz
symbols
2013-03-27Fix API diffs with new breakpad and point at private breakpad packages to testGraham Madarasz
2013-03-26NORSPEC-60 Fix for bloom on all shiny surfaces.Dave Parks
2013-03-26NORSPEC-57, NORSPEC-58 Remove sRGB and gamma correction from shaders to ↵Dave Parks
remove banding and not break all shiny objects.
2013-03-26Backed out changeset: 3643d1c655c0Dave Parks
2013-03-26Fix linux breakpad package URLGraham Madarasz (Graham)
2013-03-26MergeGraham Madarasz (Graham)
2013-03-26Point at private breakpad packages to get builds working againGraham Madarasz (Graham)
2013-03-26Add Boost System library to all testsOz Linden
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-25NORSPEC-54 Potential fix for crashing on all sorts of random operations.Dave Parks
2013-03-14Don't set shiny/bumpy texture pickers to NULL unless not editable.Tonya Souther
2013-03-09Dynamically add and remove "Use texture" normal/specular setting.Tonya Souther
2013-03-04merge changes for grouping materials requestsOz Linden
2013-03-04fix Linux warning/errorOz Linden
2013-03-01protect against missing mNormalMap or mSpecularMapOz Linden
2013-03-01merge fix for unit test problem with some python configurationsOz Linden
2013-03-01merge changes for ui fixesOz Linden
2013-03-01change channel name to new conventionOz Linden
2013-03-01remove use of system llbase module in integration tests; always use the one ↵Oz Linden
from this tree
2013-02-28Group multiple material PUT requests together and throttle requests to the ↵Kitty Barnett
region
2013-02-28Mark a material as 'pending' from the very first call to LLMaterialMgr::get()Kitty Barnett
2013-02-28Clear face's material ID internally when removing the material.Tonya Souther
2013-02-27Wire up LLMaterialMgr::remove() to edit panel.Tonya Souther
2013-02-27force new codeticket numberOz Linden
2013-02-25Fixed GCC compiler error in previous changesetKitty Barnett
2013-02-25Added "Selected Material Info" menu option to query basic material ↵Kitty Barnett
information about the current selection
2013-02-25Added LLMaterialMgr::remove() to remove material information from a faceKitty Barnett
2013-02-24Merge stray fix for infinite "get all" request loop on non-material regionsKitty Barnett
2013-02-20clean up some debug logging, add comment on llassertOz Linden
2013-02-20merge changes for material data overrunOz Linden
2013-02-19Don't overrun the message buffer extracting materials ids when the region ↵Kitty Barnett
isn't sending them
2013-02-18Prevent a failed GET from causing an infinite material request loop when ↵Kitty Barnett
there are still pending POST requests for the same region
2013-02-15merge latest rendering fixesOz Linden
2013-02-15fix crasher in setNumTEsOz Linden
2013-02-15Merge with latest viewer-dev-materials.Geenz
2013-02-15Fixed: alpha mode shaders not being bound appropriately.Geenz
2013-02-12change to force new codeticket numberOz Linden
2013-02-12remove obsolete LLMemType tracing from materialsOz Linden
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-02-12merge renderer update fixOz Linden
2013-02-12Added tag 3.4.5-release for changeset a49c715243a3Oz Linden
2013-02-06Tell the renderer to use the updated material immediately on editing it.Tonya Souther