summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-14Added tag DRTVWR-66_2.7.4-release, 2.7.4-release for changeset 057f319dd8ecDebi King (Dessie)
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-13merge changes for eli_viewer-developmentOz 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-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
2011-07-12STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some ↵Aaron Stone
cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group.
2011-07-12mergeDave Parks
2011-07-12SH-1125 Retry when failing to get seed capability.Dave Parks
2011-07-12Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-07-12fix for SH-2040: Missing '?: 0' and old style object/prim counts under Edit ↵Xiaohong Bao
linked when Mesh disabled
2011-07-12FIX STORM-1494 remove duplicate ID and xml snippeteli_linden
2011-07-12sync with viewer-developmenteli_linden
2011-07-12mergeDave Parks
2011-07-12SH-2050 Hide UI that breaks down upload fee and rename some fields.Dave Parks
2011-07-12Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-07-12mergeBrad Payne (Vir Linden)
2011-07-12SH-2049 FIXBrad Payne (Vir Linden)
2011-07-12SH-2043 FIXBrad Payne (Vir Linden)
2011-07-12CHOP-753: Defend against boost::regex exceptions.Nat Goodspeed
(per Monty code review) Explain why we intentionally don't suppress exceptions from boost::regex objects constructed with string literals. Catch std::runtime_error from boost::regex_search() and boost::regex_match(); log and return false.
2011-07-12mergeDave Parks
2011-07-12SH-2053 Don't poke the UI from a background thread -- it tends to get crashy.Dave Parks
2011-07-12CHOP-753: make getAvailableMemoryKB() only load data on Windows.Nat Goodspeed
(per Monty code review) Other platforms return -1 anyway, so don't need to call load methods.