summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-01-04merge changes for storm-493Oz Linden
2011-01-04merge changes for storm-669Oz Linden
2011-01-04merge changes for storm-823Oz 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-508 Fix for frame stalls when adjusting skin weights.Dave Parks
2010-12-30SH-714 Fix for skinned meshes being incorrectly scaled.Dave Parks
2010-12-30STORM-825 : update Merge from viewer-developmentWolfpup Lowenhar
2010-12-30Automated merge up from viewer-developmentLoren Shih
2010-12-30line endings broken againBrad Payne (Vir Linden)
2010-12-30STORM-823 FIXED Fixed Tab Key not working properly in floaters.Andrew Productengine
Bug was caused by not fiding focus root in LLUICtrl::findRootMostFocusRoot() when tab was pressed in floaters. When it was not found, LLPanel::handleKeyHere() didn't move focus to the next control. Floaters had erroneous behaviour because of focus_root xml param: though value of focus root was set with setFocusRoot() in floater's constructor , later it was overwritten in LLFloater::initFloaterXML() with value from xml again. This problem was introduced in af49c237b0f9 - there focus root was moved to xml. - To fix the problem, setFocusRoot() call was added after initFromParams() in LLFloater::initFloaterXML() to set proper value of focus root after overwriting it from xml. The drawback of the fix is that focus_root param is ignored by floaters and its value is determined depending on chrome, as it did before but the only other way to fix this problem would be to set the param in xml manually for each existing floater, and do it for each new floater added to viewer.
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-647 Switch asserts to warnings in octree for development builds (were ↵Dave Parks
already warnings in release builds).
2010-12-29SH-632 Fix for auto generating mesh LODs sometimes reducing High LOD ↵Dave Parks
triangle count.
2010-12-29SOCIAL-401 FIX Change default web profiles URL to something closer to what ↵callum
will be released
2010-12-29SOCIAL-403 FIX Update button graphic that opens Web profilescallum
2010-12-29SOCIAL-405 FIX Always make Web profiles open in internal Web content floater ↵callum
regardless of prefs
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)
2010-12-28STORM-744 : Make getMetaData pass when all is stubbedMerov Linden
2010-12-28STORM-744 : Throw exception consistently so llkdu fails consistentlyMerov Linden
2010-12-28STORM-825 : Reenable the LLMatrix3::orthogonalize test in ↵Wolfpup Lowenhar
llmath/tests/m3math_test.cpp Removed the skipping of a working test as this was causeing a the test to fail building and thus not actualy running all the tests.
2010-12-28STORM-744 : Fix release building issueMerov Linden
2010-12-28STORM-242 : pull into viewer-developmentMerov Linden
2010-12-28STORM-805 : pull into viewer-developmentMerov Linden
2010-12-28STORM-682 : pull into viewer-developmentMerov Linden
2010-12-28STORM-714 FIXED Webprim's control bar doesn't dissapear after switching to ↵Paul Guslisty
mouselook mode - After switching to the mouse look mode hide control bar immediately, not fading it with timer - Added signal for switching mouse look mode out just for convenience. It's not used in this fix.
2010-12-28STORM-242 ADDITIONAL_FIX One more build fix...Vadim ProductEngine
2010-12-28STORM-242 ADDITIONAL_FIX Fixed release build and error handling.Vadim ProductEngine
2010-12-28Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden
2010-12-27STORM-523 : pull into viewer-developmentMerov Linden
2010-12-27STORM-242 FIXED Fixed incorrect release notes URL in the "You just entered a ↵Vadim ProductEngine
region using a different server version" notification.
2010-12-27STORM-737 Eliminate commented out lineJonathan Yap
2010-12-27STORM-737 A little more code cleanup per Code Review suggestions.Jonathan Yap