summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2010-11-22merge of earlier code that got stomped from a previous mergeprep linden
2010-11-21Remove dependency on ll_align_malloc/free from avatar.Dave Parks
2010-11-21Remove ll_aligned_malloc from llspatialpartitionDave Parks
2010-11-21Prune ll_aligned_malloc/free calls out of lldrawable and llfaceDave Parks
2010-11-21Fake anti-aliasing for deferred rendering as an alternative to real anti-alia...Dave Parks
2010-11-21Fix for crash when uploading textures via importer. Uploads still fail, thou...Dave Parks
2010-11-19remove unused variable make gcc happyDave Parks
2010-11-19Don't reset preview target unless high LOD is being swapped out.Dave Parks
2010-11-19SH-525 fix for crash when specifying LOD slots out of order.Dave Parks
2010-11-19mergeDave Parks
2010-11-19SH-448 Initial draft of implementing UI spec for "advanced" importer.Dave Parks
2010-11-19Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-11-19SH-356 FIX render cost doesn't factor in revolutionsNyx (Neal Orman)
2010-11-19mergeprep linden
2010-11-19Fix for crash on accessing a translation element that is NULLprep linden
2010-11-18SH-350 SH-351 SH-355 FIX ARC fixesNyx (Neal Orman)
2010-11-18SH-350 SH-351 SH-355 FIX Several fixes for ARCNyx (Neal Orman)
2010-11-17Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-11-17SH-480 FIX meshes are not added to objects folder on uploadNyx (Neal Orman)
2010-11-17mergeBrad Payne (Vir Linden)
2010-11-17SH-476 FIX. Map tiles were failing when numeric addrs were substituted in am...Brad Payne (Vir Linden)
2010-11-17Implemented support for parsing bone offsets from a Collada file when no skel...prep linden
2010-11-15mergeprep
2010-11-15Implemented support for getting at the child translational element if the SID...prep
2010-11-15Backed out changeset: 1c9c6cdcccdeprep
2010-11-15Implemented support for getting at the child translational element if the SID...prep
2010-11-12BUILDFIX allow curl host name scrub to work on non-windows platformsNyx (Neal Orman)
2010-11-12mergeBrad Payne (Vir Linden)
2010-11-12SH-275 FIX: non-production grids now default to different source of map tilesBrad Payne (Vir Linden)
2010-11-11mergeDave Parks
2010-11-11Fix for crash in curl.Dave Parks
2010-11-10cleanupprep
2010-11-10Bug fix for an avatar that would exhibit floating if pelvis was offsetprep
2010-11-08Fix for manual merge errors.Loren Shih
2010-11-08Manual merge of llviewerwindow.cpp from mesh-development.Loren Shih
2010-11-08Backout merge of llviewerwindow; need to do manual merge since this is messy.Loren Shih
2010-11-08MergeLoren Shih
2010-11-08SH-396 WIP fix mac opensource buildNyx Linden
2010-11-08removed unused variableBrad Payne (Vir Linden)
2010-11-05BUILDFIX: commented out unused variable which breaks the mac build.Nyx Linden
2010-11-05Automated merge with https://hg.secondlife.com/mesh-developmentNyx Linden
2010-11-05SH-396 FIX mac build on mesh-development is brokenNyx Linden
2010-11-05mergeBrad Payne (Vir Linden)
2010-11-05additional analysis for --analyzeperformance optionBrad Payne (Vir Linden)
2010-11-04merging up latest changes from viewer-developmentOz Linden
2010-11-04automated merge from http://hg.secondlife.com/viewer-betaLoren Shih
2010-11-04automated merge up from viewer-betaLoren Shih
2010-11-04merge fix for STORM-261Oz Linden
2010-11-04merge fix for STORM-194Oz Linden
2010-11-04merge fix for STORM-536Oz Linden