summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-07-12fix for SH-2040: Missing '?: 0' and old style object/prim counts under Edit ↵Xiaohong Bao
linked when Mesh disabled
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-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-11Fix for linux build failure, hopefullyBrad 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-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-10mergeDave Parks
2011-07-09Added L$ price breakdown for model uploadsDon Kjer
2011-07-09mergeDave Parks
2011-07-09SH-2007 Code cleanup, expand minimum header size to 4KB, better comments ↵Dave Parks
around magic numbers, remove dead calcResourceCost
2011-07-09MergeDon Kjer
2011-07-09Fix for SH-2028. Also fixed layout issues with new upload warning and ↵Don Kjer
upload price text when floater is resized.
2011-07-09mergeBrad Payne (Vir Linden)
2011-07-09Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-07-09increment version to 2.8.0Oz Linden
2011-07-08SH-2007 Don't eat an entire core when uploading meshes or requesting fee ↵Dave Parks
information.
2011-07-08mergeDave Parks
2011-07-08SH-2008 Fix for crash when generating normals on objects with no texture ↵Dave Parks
coordinates.
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 viewer-development -> mesh-developmentDon Kjer
2011-07-08Merge viewer-development -> mesh-developmentDon Kjer
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-08Fix for sh-2016 Removed extra charprep linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 15:26:16 +0000