summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-06-07mergeprep linden
2011-06-07Fix for importer crashes, sh-1698. Added checks for handling bad elements in ↵prep linden
the dae.
2011-06-07mergeDave Parks
2011-06-07SH-1595 Make rigged attachment selection more reliable (never selectable ↵Dave Parks
when not in edit mode, always accurately selectable while in edit mode).
2011-06-07SH-1767 Fix for crash when viewing assets uploaded by mesh-asset-deprecation ↵Dave Parks
viewers
2011-06-07mergeDave Parks
2011-06-07pull back late fix from beta branchOz Linden
2011-06-06STORM-1618: re-enable deferred rendering on ATI MacsOz Linden
2011-06-06increment development viewer version to 2.7.3Oz Linden
2011-06-06SH-1738 Fix for broken UI text when deferred rendering enabled.Dave Parks
2011-06-04disable deferred rendering on ATI Macs until SH-1618 is solvedOz Linden
2011-06-04correct license headersOz Linden
2011-06-04fix DOS line endingsOz Linden
2011-06-04merge changes for storm-1318Oz Linden
2011-06-04merge changes for storm-1312Oz Linden
2011-06-04merge changes for storm-1316Oz Linden
2011-06-03FIX VWR-20803eli_linden
2011-06-03FIX VWR-20691eli_linden
2011-06-03FIX VWR-20689eli_linden
2011-06-03FIX VWR-20668eli_linden
2011-06-03Mac build fixes.Leslie Linden
Reviewed by davep.
2011-06-03 (EXP-871) FIX Add a WARNING to comment for BrowserEnableJSObject and set to ↵callum
no persist between sessions
2011-06-02Remove some unused variables.Dave Parks
2011-06-02mergeDave Parks
2011-06-02SH-1732 Add streaming cost calculation for mesh objects.Dave Parks
2011-06-02merge changes back from beta branch for SH-1691Oz Linden
2011-06-02Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
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-02Linux build fix.seth_productengine
Unused local varible removed.
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-01EXP-869 FIX -- Mac viewer should build without requiring settings modificationsLeslie Linden
Modified cmake GCC_VERSION from 4.2 to 4.0, our officially supported GCC version Reviewed by Richard
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-06-01merge changes for new searchOz 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