summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-06-07NORSPEC-233 WIP for individual material param edits across hetero object ↵Graham Madarasz
selections
2013-06-06SH-4232 FIX: Interesting: Viewer Crash on LoginRichard Linden
2013-06-05MergeRichard Linden
2013-06-05BUILDFIX: fixed llviewerassetstats test and render2dutils changesRichard Linden
that were dropped in merge
2013-06-05BUILDFIX: build fixes for macRichard Linden
2013-06-05Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingRichard Linden
2013-06-05BUILDFIX: re-added missing lldeleteutils.hRichard Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-06-05Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingXiaohong Bao
2013-06-05fix for SH-4227: interesting: long delay between root and child prim loading.Xiaohong Bao
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-04SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
fixed mem stat tracking...now properly tracks memory footprint with floating point precision cleaned up macros for unit declaration renamed units to SI standard for 1024 multiples (kibibytes, etc) fixed units output for scene monitor dump
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-04BUILDFIX: don't multiple define class statics...use inline static method insteadRichard 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-04SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
added labels to LLUnit types added memstat dumps to llscenemonitor
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
2013-06-03BUG-2707 disable sites calling OsOutputDebugString directly to identify ↵Graham Madarasz
which is tossing our errant exception
2013-06-03NORSPEC-195 Fix for incorrect alpha blending with deferred rendering enabled.Dave Parks
2013-06-03merge changes for 3.6.0-materials-beta1Oz Linden
2013-06-03Fix and organize code for managing marker files that detect last_exec_event ↵Oz Linden
and last_exec_duration
2013-06-03BUG-2707 more logging crash huntingGraham Madarasz
2013-06-03MATBUG-136 Fix for glow being too bright on rigged attachments.Dave Parks
2013-06-03MATBUG-151 Fix for black textures on Intel HD when glow is present.Dave Parks
2013-06-03NORSPEC-227 fix settings XML merge derpGraham Madarasz
2013-06-03NORSPEC-227 fix settings XML merge derpGraham Madarasz