summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-06-10Merge vwr-dev-matGraham Madarasz
2013-06-10NORSPEC-87 fix diffuse repeats display as wellGraham Madarasz
2013-06-10NORSPEC-87 fix regression from NSPEC 233 fix typo which is breaking norm ↵Graham Madarasz
repeats display
2013-06-10NORSPEC-87 fix regression from 233 fix that made spec repeats info show in ↵Graham Madarasz
norm tab
2013-06-09NORSPEC-246 fix shader compile errors from missing returnGraham Madarasz
2013-06-09NORSPEC-246 fix issues with normal encoding on precision-deprived hardware ↵Graham Madarasz
and remove haxors
2013-06-09NORSPEC-246 WIP fix callsite missed when swapping in macro implGraham Madarasz
2013-06-09NORSPEC-246 WIP Fix macro bug that slipped past due to MSVC promiscuityGraham Madarasz
2013-06-09NORSPEC-246 WIP fix handling of encoded normals with single FP only cardsGraham Madarasz
2013-06-08NORSPEC-233 fix regressions in default spec parametersGraham Madarasz
2013-06-08NORSPEC-226 NORSPEC-222 fix menu content bugs and alpha mask stomp when ↵Graham Madarasz
editing multiple objects
2013-06-08NORSPEC-233 fix default value and material apply logic errorsGraham Madarasz
2013-06-07NORSPEC-230 Fix for incorrect gamma under water.Dave Parks
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-242 Fix for infinity and NaN showing up in tangents and texture ↵Dave Parks
coordinates sometimes.
2013-06-07NORSPEC-233 WIP cleanup and fix crasher in templated material get driver funcGraham Madarasz
2013-06-07Fix busted WIP check-inGraham Madarasz
2013-06-07Merge MAINT-2740 crash fixGraham Madarasz
2013-06-07Merge vwr-dev-matGraham Madarasz
2013-06-07NORSPEC-233 WIP clean up regressions in enable/tentative logic from reworkGraham Madarasz
2013-06-07NORSPEC-233 WIP make gcc like it and do some clean-upGraham Madarasz
2013-06-07NORSPEC-233 WIP for individual material param edits across hetero object ↵Graham Madarasz
selections
2013-06-05Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-05Unwind cruft from hunting for 2707 they won't end up in vwr-dev-matGraham Madarasz
2013-06-05NORSPEC-237 nix resetting the keyboard focus to cripple the repeats per ↵Graham Madarasz
meter control
2013-06-05NORSPEC-232 Fix for broken alpha masking with basic shaders disabled.Dave Parks
2013-06-05MergeGraham Madarasz
2013-06-05Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-05NORSPEC-238, NORSPEC-225 Fix for specular map alpha channel being improperly ↵Dave Parks
used and glossiness bludgeoning environment intensity. Reviewed/written by Graham.
2013-06-05NORSPEC-238 NORSPEC-225 fix issues with env mask term being ignored and or ↵Graham Madarasz
damped by glossiness
2013-06-05NORSPEC-238 NORSPEC-225 fix issues with env mask term being ignored and or ↵Graham Madarasz
damped by glossiness
2013-06-05NORSPEC-238 spec map env mask term in alpha chan ignoredGraham Madarasz
2013-06-05NORSPEC-238 spec map env mask term in alpha chan ignoredGraham Madarasz
2013-06-05NORSPEC-236 Fix for rigged attachments with materials not rendering under ↵Dave Parks
water when advanced lighting is enabled.
2013-06-05MAINT-2740 more comment grooming and NULL string guardGraham Madarasz
2013-06-05BUG-2707 fix comment typos, remove unnecessary winmm_shim changes, and ↵Graham Madarasz
revert 2672 fix included only for local integ test
2013-06-05MErgeGraham Madarasz
2013-06-05BOOG2707 uncomment cleared suspectsGraham Madarasz
2013-06-04MAINT-2740 put debug output back with guard of debugger presence per Nat ↵Graham Madarasz
review suggestion
2013-06-04MAINT-2740 convert to std::string based API for OutputDebug wrapper ↵Graham Madarasz
cleanliness after sage counsel (slight refrain)
2013-06-04fix modified virtual function names in platform-specific modulesOz Linden
2013-06-04MAINT-2740 fix XUI callsites in debug modeGraham Madarasz
2013-06-04MAINT-2740 and MAINT-2672 rework after code review for 2740 fix and include ↵Graham Madarasz
2672 fix needed for doing local integ tests
2013-06-04merge changes for build number fixOz Linden
2013-06-04fix local build numbers when compiling a merge before committing (two parents)Oz Linden
2013-06-04MAINT-2740 make use of OsOutputDebugString _DEBUG only to avoid interactions ↵Graham Madarasz
between Win 32-bit SEH and boost coroutine fiber stack handling
2013-06-04Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-04BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid ↵Graham Madarasz
throwing unhandlable exceptions in coroutines in RelWithDebInfo builds
2013-06-03NORSPEC-229 Fix for linux build.Dave Parks
2013-06-03BUG-2707 and not break use of venerable ifdefsGraham Madarasz