summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-06-02Merge.Logan Dethrow
2011-06-02FIX VWR-24130 additional linguistic fixeli_linden
2011-06-02Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-06-02fix for SH-1691: [crashhunters] crash at ↵Xiaohong Bao
LLVolumeImplFlexible::doFlexibleUpdate() [secondlife-bin llflexibleobject.cpp]
2011-06-02fix for SH-1691: [crashhunters] crash at ↵Xiaohong Bao
LLVolumeImplFlexible::doFlexibleUpdate() [secondlife-bin llflexibleobject.cpp]
2011-06-02SH-1666 Remove "Mesh" stitching type from sculpt combo box.Dave Parks
2011-06-01mergeDave Parks
2011-06-01SH-812 Fix for rigged meshes not showing up as rigged until LoD switch.Dave Parks
2011-06-01SH-1682 Use GL_ARB_map_buffer_range to mitigate impact of mapping larger ↵Dave Parks
vertex buffer objects. Limit number of textures per batch to 6 (prevents frame stalls on NVIDIA).
2011-06-01pull back fix for storm-1298 from beta branchOz Linden
2011-06-01Merge. Pulling fix for VWR-25862 into bigger cache tree.Logan Dethrow
2011-06-01sync with viewer-developmenteli_linden
2011-06-01fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307)Xiaohong Bao
2011-06-01merge changes for storm-1296Oz Linden
2011-06-01merge changes for storm-1304Oz Linden
2011-06-01merge changes for storm-1299Oz Linden
2011-05-31merge changes for new searchOz Linden
2011-05-31FIX VWR-25397eli_linden
2011-05-31FIX VWR-24130eli_linden
2011-05-31FIX VWR-24127eli_linden
2011-05-31FIX VWR-19315eli_linden
2011-05-31FIX VWR-24126eli_linden
2011-05-31FIX VWR-20840eli_linden
2011-05-31Unused variable.Dave Parks
2011-05-31mergeDave Parks
2011-05-31SH-1682 Dynamically adjust the number of texture channels to use for indexed ↵Dave Parks
texture rendering based on available hardware.
2011-05-30SH-1592 FIXED Advanced model uploader needs an IP checkbox like the wizard ↵Seraph Linden
uploader has
2011-05-30SH-1677 FIXED [REGRESSION] Bulk uploads do not adhere to default permissionsSeraph Linden
no idea how this ever worked before, as the code since 1.23 has been using the wrong keyword ("everyone_mask" instead of "new_everyone_mask"). I suspect something changed on the sim side?
2011-05-30Fix for classic clouds being busted.Dave Parks
2011-05-30unused variableDave Parks
2011-05-30mergeDave Parks
2011-05-30SH-1682 Full integration if indexed texture rendering to improve batch size.Dave Parks
2011-05-29SH-1682 indexd diffuse fragment shader for deferred renderingDave Parks
2011-05-29SH-1682 Work in progress on using texture indexes to improve batch size ↵Dave Parks
(wow, super fast so far)
2011-05-27sync with viewer-developmenteli_linden
2011-05-27MergeLogan Dethrow
2011-05-27Removed unneeded platform directory delimeter lookups in llvocache.cppLogan Dethrow
2011-05-27merge changes for storm-1210Oz Linden
2011-05-27transplant fix for SH-1467Roxie Linden
viewer now uses simulatorfeatures to check whether to show UI elements for mesh or not
2011-05-27Merge with viewer-development.Logan Dethrow
2011-05-27Automated merge up from viewer-development into mesh-developmentSeraph Linden
2011-05-26mergeDave Parks
2011-05-26SH-1359 General octree tune-up -- increase maximum capacity of an octree ↵Dave Parks
node and rework requested octree node sizes for minimum triangles per frame and maximum triangles per drawing call.
2011-05-26FIX INTL-47 Japanese and Italian translation for set19-23, light set1-2eli_linden
2011-05-26mergeBrad Payne (Vir Linden)
2011-05-26SH-1492 WIPBrad Payne (Vir Linden)
2011-05-26Added newline at end of header file to fix linux build.Loren Shih
2011-05-26FIX DA hardware setting UI, en_xui_changeeli_linden
2011-05-27STORM-1286 - merge changes for SH-1624Debi King (Dessie)
2011-05-27STORM-1290 - merge changes for INTL-47Debi King (Dessie)