summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-07-21MergePaul ProductEngine
2011-07-20SH-715 Fix for bad "cancel" behavior in physics tab.Dave Parks
2011-07-20SH-2059 FIXED Mesh uploader UI clean up.seth_productengine
- When the “Load from file” radio is selected, the labels uner it are disabled. - Added horizontal lines to LoD tab like in the physics tab. - Physics tab: LoD dropdown moved to the left, against the “Use Level of Detail” label. - Modifiers tab: fixed dimensions to show a z value.
2011-07-20fix for sh-1847: Removed assert when a vert is outside [-5,5] domainprep
2011-07-19SH-2090 Make meshes that fail to load render as prim proxy.Dave Parks
2011-07-18mergeDave Parks
2011-07-18Changed mesh param type to not conflict with one in-use on serverDon Kjer
2011-07-18Adding support for viewer reading mesh params from an alternative param type.Don Kjer
2011-07-18merge changes for storm-1515Oz Linden
2011-07-18merge changes for storm-1517Oz Linden
2011-07-18merge changes for storm-1516Oz Linden
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18sync with viewer-developmenteli
2011-07-18fix for SH-1904: Medallion .dae makes viewer crash during uploadXiaohong Bao
2011-07-18merge changes for storm-1510Oz Linden
2011-07-18increment viewer version to 2.8.2Oz Linden
2011-07-18re-enable the watchdogOz Linden
2011-07-16merge changes for storm-1482Oz Linden
2011-07-16merge late release changes and tagsOz Linden
2011-07-16pull back late beta fixOz Linden
2011-07-16Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15After review and testing, realized that 'WatchdogEnabled' is actually true ↵jenn
to its name, and is a boolean, not a timeout value. 'MainloopTimeoutDefault' is the actual timeout value. Updated descriptions and values accordingly to set Watchdog timeout to 60 seconds.
2011-07-15Merge for STORM-1482Aaron Stone
2011-07-15STORM-1482 Always run the crash loggers, they will check what to do and how ↵Aaron Stone
to clean up.
2011-07-15fix for SH-1786: [PUBLIC] Turning off Lights and Shadows disables GlowXiaohong Bao
2011-07-15storm-1510: update to new login display urlOz Linden
2011-07-15STORM-1482 Change the defaults, look in the app_settings dir for configs as ↵Aaron Stone
well.
2011-07-15mergeBrad Payne (Vir Linden)
2011-07-15merge changes for storm-1509Oz Linden
2011-07-15STORM-1506 FIXED Reset the estate to global sun when changing region ↵Vadim ProductEngine
environment settings. By the way, moved estate info storage from the REGION/ESTATE floater to a model class.
2011-07-14Potential fix for SH-1854 and SH-1125 (caps issues)Don Kjer
2011-07-14FIX STORM-1494 remove duplicate ID and xml snippeteli
2011-07-14Fix for SH-2061 model crashes viewer - fixed an issue where a corrupted dae ↵prep
would not disable the calc button
2011-07-14STORM-1482 Little bit of Windows crash report value logging.Aaron Stone
2011-07-14merge changes for 2.7.5 releaseOz Linden
2011-07-14Fix for Sh-2047: Partial joint arrays are now able to uploadprep
2011-07-14mergeDave Parks
2011-07-14SH-715 Disable simplify/analyze button while counterpart is executing.Dave Parks
2011-07-13merge changes for storm-1507Oz Linden
2011-07-13merge changes for open-99Oz Linden
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-13SH-1637 FIX, SH-1638 FIX - fixes jittery camera problemsBrad Payne (Vir Linden)
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-12MergeDon Kjer
2011-07-12Changes to support SH-1894: Textures uploaded with Mesh do not appear in ↵Don Kjer
inventory. Reviewed by Andrew
2011-07-13Watchdog timeout now set to 60 seconds for long-term use (instead of 20, ↵jenn
used during crash pile-on). Updated setting description field to describe how setting the value of WatchdogEnabled will affect Viewer behavior.
2011-07-12CHOP-753: Eliminate redundant array-of-pair-arrays in LLMemoryInfo.Nat Goodspeed
(per Monty code review) The notion of storing LLMemoryInfo data both as an LLSD::Map and an LLSD::Array of pair arrays arose from a (possibly misguided) desire to continue producing stats output into the viewer log in the same order it always used to be produced. There is no evidence that anyone cares about the order of those stats in the log; there is no other use case for preserving order. At Monty's recommendation, eliminate generating and storing the array-of-pair-arrays form: directly store LLSD::Map.
2011-07-12Merge for STORM-1482Aaron Stone