summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-1637 and sh-1638prep linden
2011-07-08Fix for sh-2016 Removed extra charprep linden
2011-07-08Fix for sh-2016prep 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-08storm-899 and vwr-26095: correct xml to restore body parts accordian in ↵Oz Linden
appearance editor
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-08Fix for sh-2012 removed upload wizard optionprep 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-07mergeDave Parks
2011-07-07SH-1774 Remove misleading "Debug" comment -- this code performs a function.Dave Parks
2011-07-07SH-1774 Fix for preserving material assignments between multiple custom LoDs.Dave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-16 02:45:02 +0000