summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-13mergeCho
2013-04-13switched to use FacebookConnect and FacebookRedirect capabilitiesCho
2013-04-12Fix issue with alphaNonIndexedNoColorF shader and static init fail on ↵g
default spec color (real source of NORSPEC-94, I think)
2013-04-12NORSPEC-91 default to alpha blend when a material is present and a diff tex ↵g
with alpha is applied
2013-04-12SH-4090 [WIP] Basic deadman timer integration started on Linux. Moving to ↵Monty Brandenberg
windows to do real work.
2013-04-12increment version to 3.5.2Oz Linden
2013-04-12Fix merge odditiessimon
2013-04-12Added tag 3.5.1-beta1 for changeset 20cdf370f5c8Oz Linden
2013-04-12pull changes for Sunshine betaOz Linden
2013-04-12Added tag 3.5.1-beta1 for changeset 0ca3910763ceOz Linden
2013-04-12NORSPEC-111 probable fix for IntelHD advanced lighting crasherGraham Madarasz
2013-04-11Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-04-11NORSPEC-98 redux...hopefully fix mac AND linux at the same timeGraham Madarasz (Graham Linden)
2013-04-11CHUI-912 : WIP : Fix resize test when folder is empty, add more traces (to ↵Merov Linden
be deleted)
2013-04-11Adding in fast timer for testing creation of 300 avatar list items vs ↵Gilbert Gonzales
folderview items.
2013-04-11merge NORSPEC-94Oz Linden
2013-04-11mergesimon
2013-04-11Mergesimon
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-11Mergesimon
2013-04-11Clean up transfer manager code and log messages. Reviewed by Kellysimon
2013-04-11Pass binormal masks in on particles and in lldrawpoolalphaDave Parks
2013-04-11NORSPEC-98 fix? for mac shader compiler crasherGraham Madarasz (Graham Linden)
2013-04-11First pass on alpha blended materialsGeenz
2013-04-11NORSPEC-96 less insane repeats per meter behavior in planar mode for ↵Graham Madarasz (Graham Linden)
norm/spec maps
2013-04-11NORSPEC-94: Set default specular color to white.Tonya Souther
2013-04-11Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-04-10merge per pixel improvement from geenzOz Linden
2013-04-10NORSPEC-56 slight tweak to log formatting to correct material countGraham Madarasz (Graham Linden)
2013-04-10SH-4089 Unit test work. lltimer basis on Windows is zero whichMonty Brandenberg
doesn't allow negative offsetting for unit tests. Had to keep things positive. Could do windows-specific test cases but I'm hoping to dump lltimer from the implementation later.
2013-04-10Remove temp patch fileGraham Madarasz (Graham Linden)
2013-04-10Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-04-10NORSPEC-98 side-step nV compiler fail-o-ramaGraham Madarasz
2013-04-10MergeGraham Madarasz (Graham Linden)
2013-04-10NORSPEC-92 More UI fixesGraham Madarasz (Graham Linden)
2013-04-10SH-4089 Unit test work for timer. Knocked off some tests forMonty Brandenberg
the deadman's timer. Found some bugs, dig some cleanup and documented a few things. Definitely want to get rid of the U64/F64 interfaces at sometime but this is a good start.
2013-04-10NORSPEC-75 Fix bug introduced by previous change where objects with an ↵Dave Parks
emissive mask appear fullbright.
2013-04-10Fix for mac build?Dave Parks
2013-04-10Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-04-10NORSPEC-75 Add appropriate draw calls to underwater render passes so objects ↵Dave Parks
with material data don't disappear in water.
2013-04-09merge with headcallum_linden
2013-04-09MAINT-2417 FIX Update Graphics tab layoutcallum_linden
2013-04-10mergeCho
2013-04-10updated routes URLsCho
2013-04-09SH-4088 Deadman timer switch started in llcommon. Unit test started.Monty Brandenberg
Will be used for mesh, inventory, etc., operation markers.
2013-04-09merge fixes from grahamOz Linden
2013-04-10CHUI-899 (The size of conversations panel does not persist between sessions ↵mberezhnoy
if user relogin while messages pane is collapsed. )
2013-04-09More per-pixel lighting fanciness.Geenz