summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-22MergeGraham Madarasz
2013-05-22NORSPEC-204 make tex controls act like diffuse map when in media modeGraham Madarasz
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-22merge latest integration changesOz Linden
2013-05-22NORSPEC-186 clamp norm/spec map rotations to 0-360 until we can fix the ↵Graham Madarasz (Graham)
server side issue with negative rotations
2013-05-22merge changes for maint-2718Oz Linden
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-22MergeGraham Madarasz (Graham)
2013-05-22NORSPEC-205 more dueling spec controlsGraham Madarasz (Graham)
2013-05-22merge latest project repoOz Linden
2013-05-22merge tags for 3.5.2-releaseOz Linden
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-22NORSPEC-203 fix handling of objs with materials due to alpha mode in ↵Graham Madarasz
non-deferred
2013-05-22CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0maksymsproductengine
2013-05-22CHUI-841 FIXED Show warning toast even if Nearby chat is openMnikolenko ProductEngine
2013-05-22merge changes for chui-967Oz Linden
2013-05-22CHUI-967: fix display of % escapes in chatGilbert Gonzales
2013-05-21MAINT-2718 FIX Update Windows version of FMOD Ex DLLs with non-logging versionscallum_linden
2013-05-21NORSPEC-96 tweak fix to follow clone/modify/re-apply pattern from build tool ↵Graham Madarasz
to avoid changing objects sharing a material
2013-05-21NORSPEC-96 slight refrain, make Stretch Textures apply to norm/spec maps in ↵Graham Madarasz
planar texgen mode
2013-05-21MergeGraham Madarasz
2013-05-21merge changes for maint-2628Oz Linden
2013-05-21NORSPEC-200 fix regression from 188 fix caused by not having enough bits to ↵Graham Madarasz
store SHINY_TEXTURE in the TEs bitfield
2013-05-21merge changes for chop-947Oz Linden
2013-05-21BUG-2432: Crashfix. Don't call map::erase when the iterator is not valid.Oz Linden
2013-05-21merge changes for chop-948Oz Linden
2013-05-21NORSPEC-196: fix frame stalls caused by FmodEx loggingcallum_linden
2013-05-21revise test for hg to detect and ignore incorrect results from cygwin hgOz Linden
2013-05-21BUILDFIX: gcc fixesRichard Linden
2013-05-21BUIDLFIX: trying to make gcc happyRichard Linden
2013-05-21CHOP-947: create summary.json (really python) metadata file for TeamCity resultsOz Linden
2013-05-21Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-21CHOP-948: correctly persist the UpdaterWillingToTest preferenceOz Linden
2013-05-20Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingRichard Linden
2013-05-20SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
removed extra dereference for copy on write pointer moved copyonwrite mechanism to RecordingBuffers from individual buffer fixed logic that was leaving scene unfrozen when camera moved during metrics gathering
2013-05-20BUILDFIX: mac gcc fixRichard Linden
2013-05-20NORSPEC-191 make alpha masked rigged faces appear with deferred rendering on ↵Graham Madarasz
and off
2013-05-20MergeGraham Madarasz
2013-05-20MergeGraham Madarasz
2013-05-20NORSPEC-188 avoid removing 'Use Texture' item when cancelling from picker ↵Graham Madarasz
back to having prev texture
2013-05-20Mergecallum_linden
2013-05-20Quieten down writing to fmod.log - only write errors - speculate this is ↵callum_linden
related to audio stutter/frame stalls
2013-05-20NORSPEC-197 Fix for fullbright alpha masked objects not renderingDave Parks
2013-05-20SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
killed LLFastTimerView::getTime fixed block time stats always being 0
2013-05-20NORSPEC-168 fix UI update to not re-add the 'Use Texture' item when ↵Graham Madarasz
selecting legacy bump settings
2013-05-20Get latest from viewer-releasesimon
2013-05-20merge changes for 3.5.2-releaseOz Linden
2013-05-20SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
further improvements that should eliminate more short duration recording periods
2013-05-20SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
fixed copy construction of Recorders, eliminated most zero-length frames fixed reset behavior of periodic recordings and extendable recordings to clear entire history removed busy-loop recording of stats from worker threads...stats reported only when work is done
2013-05-17increment version to 3.5.3 to be higher than the releaseOz Linden