summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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.
2011-07-12SH-2052 Fix for reported PE being too low when selecting more than 500 objects.Dave Parks
2011-07-12Automated merge with ↵Xiaohong Bao
http://bitbucket.org/VirLinden/mesh-development-non-blockers
2011-07-11fix for SH-2051: viewer crashes when try to disbable "Show Upload Cost"Xiaohong Bao
2011-07-11merge changes for storm-1315Oz Linden
2011-07-11merge changes for storm-1459Oz Linden
2011-07-11merge changes for storm-1325Oz Linden
2011-07-11Automated merge with ↵Xiaohong Bao
https://bitbucket.org/squire_linden/viewer-development-crash-horde
2011-07-11more fix for STORM-1468: [crashhunters] pre-login crash at ↵Xiaohong Bao
LLViewerWindow::LLViewerWindow(std::basic_string,std::allocator > const &,std::basic_string,std::allocator > const &,int,int,int,int,int,int) [secondlife-bin llviewerwindow.cpp]
2011-07-11Fix for sh-1982 and sh-2025prep
2011-07-11CHOP-753: Add classic-C-style diagnostics around popen("vm_stat").Nat Goodspeed
On Mac, where LLMemoryInfo relies on a child process rather than any sort of internal system API, try to produce more informative LL_WARNS output if popen() fails to run vm_stat, or if vm_stat terminates with nonzero rc.
2011-07-11mergeprep
2011-07-11SH-2012: removed upload wizard from inventory '+' menuprep
2011-07-11mergeBrad Payne (Vir Linden)
2011-07-11Fix for linux build failure, hopefullyBrad Payne (Vir Linden)
2011-07-11mergeBrad Payne (Vir Linden)
2011-07-11CHOP-753: Add timestamp to LLMemoryInfo's LLSD stats block.Nat Goodspeed
For postprocessing these stats, we'll want the time at which they were captured. We'll want the current framerate too, but handle that at a higher level.
2011-07-11increment viewer version to 2.8.1Oz Linden
2011-07-11Added tag 2.8.0-start for changeset e1ed60913230Oz Linden
2011-07-11merge changes for storm-1488Oz Linden
2011-07-11merge changes for chop-661Oz Linden
2011-07-11merge changes for storm-1481Oz Linden
2011-07-11merge changes for storm-1472Oz Linden
2011-07-11merge changes for storm-1483Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 20:29:20 +0000