summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-22MergeGraham Madarasz (Graham)
2013-05-22NORSPEC-205 more dueling spec controlsGraham Madarasz (Graham)
2013-05-22merge latest project repoOz 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-22merge changes for chui-967Oz Linden
2013-05-22CHUI-967: fix display of % escapes in chatGilbert Gonzales
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-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-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-20NORSPEC-168 fix UI update to not re-add the 'Use Texture' item when ↵Graham Madarasz
selecting legacy bump settings
2013-05-17increment version to 3.5.3 to be higher than the releaseOz Linden
2013-05-17merge changes for lastest integrationsOz Linden
2013-05-17Merge vwr-dev-matGraham Madarasz (Graham)
2013-05-17NORSPEC-189 restore old mat param update registrationGraham Madarasz (Graham)
2013-05-17merge changes for latest integration repoOz Linden
2013-05-17increment version to 3.6.0Oz Linden
2013-05-17Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-17NORSPEC-187 Add directionality to ambient lighting.Dave Parks
2013-05-17Extra fix for Dave's shader OS X related shader changecallum_linden
2013-05-17Backout OpenGL 2.1 compatibility attemptDave Parks
2013-05-17NORSPEC-187 Directional ambient work in progress.Dave Parks
2013-05-17Merge with headcallum_linden
2013-05-16Fix for compilation error in shadows disabled and don't load transform ↵Dave Parks
feedback shaders unless transform feedback is enabled.
2013-05-16MergeGraham Madarasz
2013-05-16Merge beta fixesGraham Madarasz
2013-05-16NORSPEC-190 Fix for local lights not being gamma corrected on alpha objects.Dave Parks
2013-05-16NORSPEC-189 return to inefficient material update reg to avoid crashes from ↵Graham Madarasz
brundlefly solution with old reg and new callback
2013-05-16NORSPEC-185 Fix for regression caused by accidentally checking in debug code.Dave Parks
2013-05-16Mergecallum_linden
2013-05-16merge changes for 3.5.3-beta6Oz Linden
2013-05-15NORSPEC-119 put back TE-specific get registration in material manager ↵Graham Madarasz
stomped during 'reloading'.