summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-01-06Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-01-05mergeprep
2011-01-05Fix for SH-579prep
2011-01-05Automated merge up from viewer-developmentLoren Shih
2011-01-05Automated merge from mesh-developmentLoren Shih
2011-01-05SH-741 FIXED Mesh assets cannot be dragged into notecardsLoren Shih
Added DAD_MESH to list of text editor -allowed drag and drop types. Minor tab reformatting.
2011-01-05mergeprep
2011-01-05patch for gl_any_samples_passed missing define on macprep
2011-01-05fixed line endings againBrad Payne (Vir Linden)
2011-01-05mergeBrad Payne (Vir Linden)
2011-01-05mergeDave Parks
2011-01-05SH-571 Fix for mesh shadows blinking on LoD switch.Dave Parks
2011-01-04VWR-21927 Fix for water reflections causing LoD updates.Dave Parks
SH-735 Potential fix for ATI X1950 wasting time in occlusion culling.
2011-01-04Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-01-04SH-739 Meshes can no longer be moved into subfolders of the "Meshes" folderLoren Shih
Did this ever work? The code for handling drag&drop is broken completely for meshes; you can't drag them anywhere in inventory. Also did some formatting/cleanup of related code.
2011-01-04clear some LLPointer issues for SH-694: check if there are any other ↵Xiaohong Bao
LLPointer issues in the mesh model uploading flow and fix them if exist.
2011-01-04Automated merge from mesh-developmentLoren Shih
2011-01-04merge changes for storm-398Oz Linden
2011-01-04merge changes for storm-467Oz Linden
2011-01-04merge changes for storm-485Oz Linden
2011-01-04merge changes for storm-737Oz Linden
2011-01-04merge changes for storm-466Oz Linden
2011-01-04merge changes for storm-513Oz Linden
2011-01-04merge changes for storm-493Oz Linden
2011-01-04merge changes for storm-669Oz Linden
2011-01-04fixing mac build errorleyla_linden
2011-01-04Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-01-04Automated merge from mesh-developmentLoren Shih
2010-12-31Faster occlusion queries (take advantage of GL_ARB_occlusion_query2 where ↵Dave Parks
available and don't read back result if it will block).
2010-12-31SH-727 Working cancel button and cancel buttons for physics decomp stages.Dave Parks
2010-12-31Mergeleyla_linden
2010-12-31Physics stage of wizardleyla_linden
2010-12-30automated mergeRoxie Linden
2010-12-30Code review fix from davep - use booling or operator and not binary oneRoxie Linden
Remove unnecessary state check. Initial dialog work for showing physics cost in upload dialog
2010-12-30SH-714 Fix for skinned meshes being incorrectly scaled.Dave Parks
2010-12-30Automated merge up from viewer-developmentLoren Shih
2010-12-30line endings broken againBrad Payne (Vir Linden)
2010-12-30Automated merge from viewer-developmentLoren Shih
2010-12-30Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-12-30BUG STORM-493 'Map' button slightly overlaps scroll bar into My Group ↵Paul Guslisty
info->Land/Assets accordion - Decreased button width
2010-12-30BUG STORM-513 "Allow media to auto - play" check-box is enable after Media ↵Paul Guslisty
check-box was unchecked - Now if "Media" check-box is unchecked, "Allow media to auto - play" check-box is disabled too.
2010-12-29SH-632 Fix for auto generating mesh LODs sometimes reducing High LOD ↵Dave Parks
triangle count.
2010-12-29automated mergeRoxie Linden
2010-12-29merge kdu unit tests (storm-744)Oz Linden
2010-12-29SH-702 Broken Window: rename shader_heirarchy.txt to shader_hierarchy.txtLoren Shih
Trivial rename (file is an unused doc file).
2010-12-29mergeBrad Payne (Vir Linden)
2010-12-29Automated merge up from viewer-developmentLoren Shih
2010-12-29Automated merge from mesh-developmentLoren Shih
2010-12-29SH-652 Viewer crash when right-clicking an avatar while in edit modeLoren Shih
Null pointer issue.
2010-12-29allow run-time query of which timer function is being usedBrad Payne (Vir Linden)