summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2011-06-24CHOP-753: add timestamp and <mem> marker to memory stats log linesNat Goodspeed
2011-06-23Log enriched memory info for Mac too.Nat Goodspeed
Add Mac logic to LLMemoryInfo::stream(): run vm_stat and log its output. Add comments with Mac and Linux suggestions to LLMemoryInfo::getAvailableMemoryKB(), responding to comment: //do not know how to collect available memory info for other systems.
2011-06-23Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-06-20increment viewer version to 2.7.5Oz Linden
2011-06-14mergeBrad Payne (Vir Linden)
2011-06-13increment viewer version to 2.7.4Oz Linden
2011-06-09mergeBrad Payne (Vir Linden)
2011-06-08Merge from viewer-experienceLeslie Linden
2011-06-07merge changes for storm-1258Oz Linden
2011-06-07mergeDave Parks
2011-06-06increment development viewer version to 2.7.3Oz Linden
2011-06-04correct license headersOz Linden
2011-06-01merge changes for storm-1299Oz Linden
2011-05-30Adding the outboxLeyla Farazha
2011-05-27increment viewer version to 2.7.2Oz Linden
2011-05-27merge changes for storm-1210Oz Linden
2011-05-25SH-1603 Replace every occurrence of "WTF" with something more appropriate.Dave Parks
2011-05-25Sh-1647: Accounting caps updateprep
2011-05-25automated merge mesh-development -> mesh-developmentLoren Shih
2011-05-24MergeDave SIMmONs
2011-05-24Added badges version 0.1 to buttons.Leslie Linden
Reviewed by Richard
2011-05-23increment viewer version to 2.7.1Oz Linden
2011-05-20SH-1252 and SH-1253 WIP.prep linden
2011-05-19increment viewer version to 2.7.0Oz Linden
2011-05-17Merge with viewer-development (mesh)Don Kjer
2011-05-17Merge with viewer-developmentDon Kjer
2011-05-16Correctly identify Server 2008, Server 2008 R2, Server 2012, and Windows 8Tank_Master
2011-05-16mergeDave Parks
2011-05-12mergeDave Parks
2011-05-12Fix up alignment problems for debug build.brad kittenbrink
reviewed by davep.
2011-05-12mergeDave Parks
2011-05-09Merge.brad kittenbrink
2011-05-09increment viewer version to 2.6.9Oz Linden
2011-05-07storm-1237: merge experience team issuesOz Linden
2011-05-05Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated ↵brad kittenbrink
a bunch of unnecesary header dependencies.
2011-05-05Remove Pth library from viewer build.Nat Goodspeed
This library was only needed on the Mac, and only with the OS X 10.4 SDK. As of October 2010, we no longer build the viewer with that SDK. The 10.5 SDK we're currently using directly supports the functionality for which we originally brought in Pth.
2011-05-04EXP-779 FIX -- Help > About Second Life Reports Kernel Version Twice, ↵Leslie Linden
Instead of OS Version Modified Mac OS_VERSION string to include OS X version number in addition to Kernel version info. DARWIN llcommon build now depends on Carbon in order to provide this functionality. Reviewed by Richard.
2011-05-03Merge.brad kittenbrink
2011-05-02mergeDave Parks
2011-05-02increment viewer version to 2.6.8Oz Linden
2011-04-29Merged with viewer-development.Ricky Curtice
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-26FIX CHOP-629: Enabled debugging info for llcommon.dllbrad kittenbrink
2011-04-26Merge with viewer-developmentDon Kjer
2011-04-25increment viewer version to 2.6.7Oz Linden
2011-04-22mergeDave Parks
2011-04-21mergeDave Parks
2011-04-21mergeDave Parks
2011-04-20Merge with viewer-developmentDon Kjer
2011-04-19mergeDave Parks
2011-04-19mergeDave Parks