summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2014-06-05MergeRicky Curtice
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-03-19OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBSOz Linden
2014-01-27MAINT-3661 Fix for crash when uploading corrupt .dae file.Dave Parks
2013-10-08merge from viewer-releaseRichard Linden
2013-10-01Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-09-23MAINT-3179 fix bad indexing of position info generating false alarms on ↵Graham Linden
range checks, issue with free of data now allocated contig with positions instead, and added copious amounts of llwarns to error return sites so 'invalid element' will be a reason to read the log and not a tease.
2013-09-16MAINT-3153 fix potential mis-indexing in DAE loading checksGraham Linden
2013-09-16MAINT-2388 replace stomped fix to not crash when handed bogus model dataGraham Linden
2013-08-19MergeXiaohong Bao
2013-08-19Merge in viewer-releaseGraham Linden
2013-08-14BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macrosRichard Linden
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-31BUILDFIX: bad quotesRichard Linden
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-19BUILDFIX: #include and dependency cleanupRichard Linden
2013-06-27Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20merge with releaseRichard Linden
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-15NORSPEC-267 fix UI feedback for materials edits not appearing for observers ↵Graham Linden
when obj was selected by them
2013-06-08NORSPEC-233 fix default value and material apply logic errorsGraham Madarasz
2013-06-07NORSPEC-233 WIP fix completely bogus substitution of offsets for scales and ↵Graham Madarasz
make scale accessors get with the program
2013-06-07NORSPEC-233 WIP for individual material param edits across hetero object ↵Graham Madarasz
selections
2013-06-05merge with viewer-releaseRichard Linden
2013-05-14NORSPEC-102 & Co ReloadedKitty Barnett
2013-05-13NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more ↵Graham Madarasz
consistent and increased max range on repeats per meter
2013-05-12LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::nullKitty Barnett
2013-05-12Merged with viewer-dev-materialsKitty Barnett
2013-05-11Fix many issues with selection misapplication and rendering not matching ↵Graham Madarasz
applied materials
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-10NORSPEC-102 Rapid materials updates are not smooth to viewer which is ↵Kitty Barnett
editing the object
2013-05-09NORSPEC-164 fix TE copy ctor and operator= to include material pointer in ↵Graham Madarasz
addition to ID
2013-05-09Mergesimon
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-07Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-05-07Optimization -- don't draw glow in alpha pool unless neededDave Parks
2013-05-07Merge vwr-dev-matGraham Madarasz
2013-05-06SH-4080 WIP interesting: random crash on MacRichard Linden
cleaning up more unused files
2013-05-06NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.Dave Parks
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-17Merge with latest viewer-dev-materials.Geenz
2013-04-17NORSPEC-90 Alpha pool hookups for materials.Dave Parks
2013-04-16NORSPEC-123 et al...roll back NSPEC 91 fix to avoid knock-on and set correct ↵Graham Madarasz
default env intensity
2013-04-12Fix issue with alphaNonIndexedNoColorF shader and static init fail on ↵g
default spec color (real source of NORSPEC-94, I think)