summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-01-06Automated merge up from viewer-developmentLoren Shih
2011-01-06Automated merge from mesh-developmentLoren Shih
2011-01-06SH-690 FIXED Name field in Upload Model dialog allows unicode charaters to ↵Loren Shih
be entered which shows a blank name in inventory once uploaded Disabled unicode character input.
2011-01-05merge changes for storm-806Oz Linden
2011-01-05merge changes for storm-825Oz Linden
2011-01-05SH-716 FIXED Water reflections should not default to ON for High graphics ↵Loren Shih
setting Revert to previous behavior. Reflections stay at "minimal".
2011-01-05Automated merge from viewer-developmentLoren Shih
2011-01-05SH-716 FIXED Water reflections should not default to ON for High graphics ↵Loren Shih
setting Revert to previous behavior. Reflections stay at "minimal".
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-04trival: fix compiling errors for Linux.Xiaohong Bao
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-04a debug tool to detect LLPointer issues for SH-694: check if there are any ↵Xiaohong Bao
other LLPointer issues in the mesh model uploading flow and fix them if exist. This debug tool is off by default. To turn it on, set LL_REF_COUNT_DEBUG to be 1 in the header file "llcommon/llrefcount.h".
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-04merge changes for storm-823Oz Linden
2011-01-04fixing mac build errorleyla_linden
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