summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-05-20Merge downstream codesimon
2013-05-20Get latest from viewer-releasesimon
2013-05-20MAINT-2616 : Updated my Intel driver and now have orange in buttons andsimon
Inventory pull down bar causing blinks to screen. Pulled in FS code, Reviewed by Kelly
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-17Simple imposter AV rendering cleanupsimon
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'.
2013-05-15MergeGraham Madarasz
2013-05-15Attempt at making deferred rendering work on OpenGL 2.1Dave Parks
2013-05-15MergeGraham Madarasz
2013-05-15NORSPEC-152 better default norm/spec textures which read better in the UI ↵Graham Madarasz
and provide better default spec feedback
2013-05-15merge up to latest integration repoOz Linden
2013-05-15NORSPEC-175 Force "alpha mode" to blend in UI when transparency is above zeroDave Parks
2013-05-15Mergecallum_linden
2013-05-15NORSPEC-132 Fix (again) Rotation degree has range -9999.00..9999.00callum_linden
2013-05-15MAINT-2665: fix crashes being counted as wrong type in last_exec_event due ↵Oz Linden
to log macro wrapper
2013-05-15Mergesimon
2013-05-15BUG-2581 : [simon-ll-viewer-cat] Path cut, hollow and slice break planarsimon
texture mapping on prims. Credits to DaveP
2013-05-15NORSPEC-183 fix regression in diff map blank texture from NSPEC 152 fix by ↵Graham Madarasz
forcing new BlankImageID to the old default
2013-05-14NORSPEC-103 added new shaders for using norm/spec TCs in overlayGraham Madarasz
2013-05-14MergeGraham Madarasz
2013-05-14NORSPEC-103 reflect normal/spec UVs in face edit overlay displayGraham Madarasz
2013-05-14NORSPEC-181 Fix for performance regression.Dave Parks
2013-05-14SH-4190 Reactivate unit tests neutered under MAINT-3202Monty Brandenberg
HttpStatus unit tests have never caused a unit test failure but they do have the word 'error' in their text descriptions which gets picked up by the log processor in TC builds. So, reactivate the tests and reform the descriptions.
2013-05-14NORSPEC-102 & Co ReloadedKitty Barnett
2013-05-14Merge. Refresh from viewer-cat after it pulled viewer-beta.Monty Brandenberg
2013-05-14Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-14Fix EOL characterssimon
2013-05-14Merge in latest viewer-betasimon
2013-05-14MAINT-2302 Tests frequently fail on Windows builds.Monty Brandenberg
I'm calling this the more correct fix. The httprequest tests actually talk to an HTTP server running in the Python test scaffold script. Under severe CPU competition, it may not get the cycles needed to start up and make progress. So this modifies the test to spin a little faster and dwell waiting on the server for a longer period. Hope this will be adequate to make the tests reliable.
2013-05-14NORSPEC-85 fix default normal vert offsetGraham Madarasz
2013-05-14NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in ↵Graham Madarasz
graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 01:16:22 +0000