summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-07-16Automated merge with https://bitbucket.org/lindenlab/viewer-developmentjenn
2011-07-15merge changes for storm-1509Oz Linden
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-13SH-1637 FIX, SH-1638 FIX - fixes jittery camera problemsBrad Payne (Vir Linden)
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-12FIX STORM-1494 remove duplicate ID and xml snippeteli_linden
2011-07-12sync with viewer-developmenteli_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-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-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-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-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
2011-07-09Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-07-09increment version to 2.8.0Oz Linden
2011-07-08fix 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-08merge changes for storm-1491Oz Linden
2011-07-08merge changes for storm-1489Oz Linden
2011-07-08ER-910 cleanup: removed a stale comment, tweaked text in About Land dialogsimon@lindenlab.com
Options tab.
2011-07-08EXP-990 FIX Cannot select from Texture picker for Groups profile picRichard Linden
reviewed by Leslie
2011-07-08sync with viewer-developmenteli_linden
2011-07-08merge changes for storm-1484Oz Linden
2011-07-08merge changes for vwr-25753Oz Linden
2011-07-08SH-2014 FIXBrad Payne (Vir Linden)
2011-07-08EXP-983 FIX -- Viewer crashes around Place Profile and Landmarks listing in ↵Leslie Linden
Viewer Experience Drag and drop for LLFolderView now handles the empty mFolders case.
2011-07-08merge changes for storm-1462Oz Linden
2011-07-08Disabling outbox panel display logic for the time being.Leslie Linden
2011-07-08merge changes for storm-1485Oz Linden
2011-07-07CHOP-661: Fix HTTPServer usage to turn off allow_reuse_address.Nat Goodspeed
Turns out that BaseHTTPServer.HTTPServer turns on that flag by default, which causes freeport() to fail (on Windows only?), happily instantiating multiple servers on the same port. Change known instances, fix freeport() docstring to highlight the issue. Add freeport() unit tests to verify expected behavior.
2011-07-07Merge latest from viewer trunksimon@lindenlab.com
2011-07-07Revert code fo ER-1016 - "Remove ability for anyone to edit terrain"simon@lindenlab.com
and muck with the "About Land" Options tab one more time.
2011-07-07Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-07-07MergeLeslie Linden
2011-07-07EXP-985 FIX -- Always show Inbox panel if "Received Items" folder existsLeslie Linden
The presence of the inbox folder now forces the "Received Items" folder to be visible. The same logic applies to the outbox as well. Reviewed by Richard.
2011-07-07EXP-984 FIX -- My Inventory listing scrolls to bottom when Received Items ↵Leslie Linden
panel is loaded with several items present * Updated initial view setup to clear selection from "My Inventory" or the root folder after opening it. Reviewed by Richard.
2011-07-07Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2011-07-07EXP-847 FIX As a user, I would like to see the How To floater appear the ↵Richard Linden
first time I log in to basic mode turned off save_rect for basic mode help window so it isn't influenced by resizing window in advanced mode
2011-07-07EXP-847 FIX As a user, I would like to see the How To floater appear the ↵Richard Linden
first time I log in to basic mode made help window not appear on login for advanced mode made help window visibility state properly persist in advanced mode