summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-11-22CTS-320 SH-465 FIX use system zlib for standalone buildsNyx (Neal Orman)
pulling boroondas' changes to change our includes to use the system versions of zlib if doing a standalone build. Code changes are minimal, and appear to work correctly. Approved. - Nyx
2010-11-22Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-11-22SH-466 FIX fix of VWR-20670/SNOW-506 lost in mergeNyx (Neal Orman)
Verified that the fix is no longer in mesh-development. Verified fix is still in viewer-development. Fix is simply changing visibility of LLInstanceTracker base in LLEventTimer from protected to public. The lack of this fix indicates a bad merge. Re-applying fix.
2010-11-22SH-467 FIX fix of VWR-20809/SNOW-504 lost in mergeNyx (Neal Orman)
re-applying the fix originally committed as c5ddd1e361ae. This allows standalone builds to not depend on stage_third_party_libs but was lost in a merge as referenced in jira. Re-reviewed the code in the patch and it is a valid fix.
2010-11-22SH-468 FIX fix of VWR-20810/SNOW-503 lost in mergeNyx (Neal Orman)
re-applying changeset b987077e9bbb as it was lost in the merge. reviewed the original patch, appears valid.
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-21Get rid of more ll_aligned_malloc calls.Dave Parks
2010-11-21Get rid of pointless redirection and malloc/free.Dave Parks
2010-11-21Fake anti-aliasing for deferred rendering as an alternative to real ↵Dave Parks
anti-aliasing.
2010-11-21Fix for crash when uploading textures via importer. Uploads still fail, ↵Dave Parks
though, fix just makes them stop trying after 5 retries when getting 499 or 500 status codes.
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-19Don't use llwarns/llinfos from a background thread.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)
Added a revolutions factor to render cost calculations. Adding revolutions will multiply your render cost based on how much geometry is added, from 1x up to 4x Code reviewed by Davep. Wiki documentation updated.
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)
Had a few debugging lines in my last checkin. Cleaning up unreviewed changes.
2010-11-18SH-350 SH-351 SH-355 FIX Several fixes for ARCNyx (Neal Orman)
Fixed the texture resolution calculation against the rounding errors we had before. Fixed the bug where linking prims changed the combined cost Fixed the bug where twisting was not computed properly Code reviewed by davep.
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)
curl host scrubbing was causing object creation for mesh prims to fail. Commenting out the offending lines so we can have a functional release. Will file a separate bug for Vir to investigate when/if we can re-enable host scrubbing on these URLs for a future release. Approach approved by davep.
2010-11-17mergeBrad Payne (Vir Linden)
2010-11-17SH-476 FIX. Map tiles were failing when numeric addrs were substituted in ↵Brad Payne (Vir Linden)
amazon S3 image queries
2010-11-17Implemented support for parsing bone offsets from a Collada file when no ↵prep linden
skeletal node is present.
2010-11-15mergeprep
2010-11-15Implemented support for getting at the child translational element if the ↵prep
SID fails to resolved.
2010-11-15Backed out changeset: 1c9c6cdcccdeprep
2010-11-15Implemented support for getting at the child translational element if the ↵prep
SID fails to resolved.
2010-11-12BUILDFIX allow curl host name scrub to work on non-windows platformsNyx (Neal Orman)
Needed an include for gethostbyname to be called properly.
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
Bug fix for attach/detach so that it will recalculate certain avatar settings based upon bone positions.
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
This checkin causes llviewerwindow to become the viewer-development version.
2010-11-08MergeLoren Shih
2010-11-08SH-396 WIP fix mac opensource buildNyx Linden
Missed a reference to libcollada in viewer_manifest. Hopefully should be packaged and set properly now.
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
Adding collada to the list of libraries we need to package with the viewer Not sure why this wasn't here earlier, but this should solve the packaging problem.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 06:52:07 +0000