summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2013-02-06merge fix to defer server updatesOz Linden
2013-02-05Added tag 3.4.5-beta5 for changeset 852b69ef0b5fOz Linden
2013-02-05merge changes for DRTVWR-297Oz Linden
2013-02-05tag merge of DRTVWR-297Oz Linden
2013-02-05merge changes for DRTVWR-296Oz Linden
2013-02-05tag merge of DRTVWR-296Oz Linden
2013-02-05Don't send a materials update to the sim until the previous one has been ↵Tonya Souther
acknowledged.
2013-02-04MAINT-2323 Fix for crash on shutodwn in mesh responder destructorsDave Parks
2013-02-04Whoops! Normal maps don't belong here...Geenz
2013-02-04Merged with latest viewer-dev-materials.Geenz
2013-02-04Merged with latest viewer-dev-materials.Geenz
2013-02-04Added a new draw pool specifically for faces with materials applied to them. ↵Geenz
Removed materials rendering from the bump draw pool, and reverted it to its previous state.
2013-02-04merge tonyas loop fixesOz Linden
2013-02-04improve and clarify loggingOz Linden
2013-02-03Don't spam the sim with repeated queries for an empty list of materials.Tonya Souther
2013-02-03Enable sending material updates.Tonya Souther
2013-02-04Merged with viewer-dev-materialsKitty Barnett
2013-02-04Material PUT queue entries aren't removed after a request is sentKitty Barnett
2013-02-01merge up to latest version from tonyaOz Linden
2013-02-01add debug logging, ostream support for material ids, and some minor cleanupOz Linden
2013-02-01STORM-1930 Quality & Speed slider has Ultra label where High should be.Whirly
2013-01-31make logging tag for Materials uniformOz Linden
2013-01-31Fixing VC++ compile error: calling a static routine doesn't need the "this" ↵Tonya Souther
pointer
2013-01-31Merging in main repository.Tonya Souther