summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-01mergeDave Parks
2011-02-01mergeDave Parks
2011-02-01SH-818 Fix for inability to disable anti-aliasing on ATI catalyst.Dave Parks
2011-02-01Sync with viewer-betaEli Linden
2011-02-01mergeprep linden
2011-02-01SH-512: Inworld scale weights use previous maximum (10)prep linden
2011-02-01merge fix for SH-659 from v-d to mesh: small textures not loadedXiaohong Bao
2011-02-01mergeDave Parks
2011-02-01Line endings?Dave Parks
2011-02-01mergeTofu Buzzard
2011-02-01mergeTofu Buzzard
2011-02-01Fixes for merge up from viewer-development to mesh-development.Loren Shih
Backed out SH-659 since merge was messy; this will be merged in manually later.
2011-02-01mergeTofu Buzzard
2011-02-01mergeTofu Buzzard
2011-02-01STORM-655 FIXED mismatched filter extension in snapshot floater (jpeg vs jpg)paul_productengine
- Added filter "jpg" for "Save As..." dialog so that *.jpg files can be seen as well as *.jpeg.
2011-02-01Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-01Automated merge from mesh-developmentLoren Shih
2011-02-01merge changes back from beta branchOz Linden
2011-02-01SH-831 Fix for local lights option not disabling local lights.Dave Parks
2011-02-01mergeDave Parks
2011-02-01SH-641 Cosmetic fix -- keep showing last rendered mesh LoD if requested LoD ↵Dave Parks
is unavailable.
2011-02-01mergeDave Parks
2011-02-01SH-483 Fix for varioius issues with hi-rez snapshots -- mainly disable the ↵Dave Parks
ability to take hi-rez snapshots if UI or HUD attachments are in the snapshot, and go back to old tile compositing method instead of using huge framebuffer objects.
2011-01-31MergeKent Quirk
2011-01-31VWR-22024 -- apply Bao's patch to betaKent Quirk
2011-01-31mergeBrad Payne (Vir Linden)
2011-01-31SH-872 WIP - temporarily disabling problematic log output to see if that ↵Brad Payne (Vir Linden)
fixes crash on test machine
2011-01-31Fix for Sh-512: Scales use their previous maximum valueprep
2011-01-31merge changes for storm-934Oz Linden
2011-01-31pull changes for STORM-940 and CHOP-369Oz Linden
2011-01-31merge changes for storm-845Oz Linden
2011-01-31merge changes for storm-829Oz Linden
2011-01-31merge changes for storm-643Oz Linden
2011-01-31merge changes for storm-351Oz Linden
2011-01-30dither compat tweakTofu Buzzard
2011-01-30mergeTofu Buzzard
2011-01-29Automated merge with file:///Users/oz/Work/V-DOz Linden
2011-01-29correct DOS line endingsOz Linden
2011-01-28merge the changeset 4de3178c6c81 from viewer-development: fixed the major ↵Xiaohong Bao
memory leaking for SH-723/SH-847: memoy leaking
2011-01-28Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-01-28trivial: remove some debug code.Xiaohong Bao
2011-01-28automated mergeRoxie Linden
2011-01-28Mergeleyla_linden
2011-01-28SH-808 making sure the 10m vs. 64m scale limit switch happens for both the ↵leyla_linden
spinner and the manipulation tools etc.
2011-01-28SH-753 - Ghost meshesRoxie Linden
Fix the case where the silhouette shown when editing a mesh in an adjacent region was showing up in the wrong place. The silhouette was not being translated by the avs view with respect to the region.
2011-01-28fixed the major memory leaking for SH-723/SH-847: memoy leakingXiaohong Bao
2011-01-28trivial: convert to "unix return"Xiaohong Bao
2011-01-28Merge with headcallum
2011-01-28STORM-934 POSSIBLE FIX [crashhunters] crash at [2] ↵callum
LLPanelAvatarProfile::got_full_name_callback(LLUUID const &,std::basic_string,std::allocator > const &,bool) [secondlife-bin llpanelavatar.cpp]
2011-01-28mergeBrad Payne (Vir Linden)