summaryrefslogtreecommitdiff
path: root/indra/llvfs
AgeCommit message (Collapse)Author
2013-09-26BUILDFIX: ll_aligned_free callRichard Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-08-19MergeXiaohong Bao
2013-08-14BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macrosRichard Linden
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-05Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-11Merged in viewer-releaseAura Linden
2013-06-27CHOP-956: Add settings_install.xml to settings_files.xml.Nat Goodspeed
Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from settings_files.xml.
2013-06-20merge with releaseRichard Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-05-30BUG-2707 add some logging to help narrow down what part of login instance ↵Graham Madarasz
handling is going awry
2013-05-16Removed debugging.Aura Linden
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-02-22CHUI-778 (Saving preferences updates text in all open message panels in ↵Gilbert Gonzales
conversation floater to show as old messages) Now changing the log/transcripts file location actually moves the files to the new location. Prior behavior just started a new history at that location. Also a fix was made so that if the user changed the log/transcripts path then after pressing the Preferences 'OK' button the new location will be saved to the corresponding .xml file.
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-24CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tabmaksymsproductengine
2013-01-04Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-12-16MergedAura Linden
2012-12-16Fixed small one-time memory leaks.Aura Linden
2012-12-14BOOL vs bool FIGHTAura Linden
2012-12-13Fixes from Oz's merge.Aura Linden
2012-12-13merge changes for DRTVWR-244Oz Linden
2012-12-11Merged from viewer-releaseAura Linden
2012-12-11Crash reporter fixed, debugging removed.Aura Linden
2012-12-11Interim debug checkin to test from teamcityAura Linden
2012-11-30SH-3594: Fix for crash when outfits are changed on a non server based baking ↵prep@lindenlab.com
region.
2012-11-30Removed logging.Aura Linden
2012-11-29Crashlogger only runs when it comes from teamcity so I must checkin debug ↵Aura Linden
and wait. What fun.
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-27New VFS objects included in every bite!Aura Linden
2012-11-19merge with viewer-developmentRichard Linden
2012-11-16Some Mac header #defines macros like check and equivalent -- gack!!Nat Goodspeed
Given that third-party libraries (such as Boost) can and do use those names, properly namespace-scoped, it's unpardonable to break any such innocent usage with a macro. Given the pervasiveness of the need, introduce a header file with the requisite #undef directives.
2012-11-16Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-14SH-3406 WIP convert fast timers to lltrace systemRichard Linden
cleaning up build moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc streamlined Time class and consolidated functionality in BlockTimer class llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-12Ported slplugin and some other missing components for cocoa.Aura Linden
2012-11-12First round of fixes to make viewer work with Boost 1.52callum_linden
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-01SH-3405 FIX convert existing stats to lltrace systemRichard Linden
final removal of remaining LLStat code
2012-10-23Allow user to override either English, or localized, skinned file.Nat Goodspeed
Original LLDir::findSkinnedFilenames() implementation used a tricky rule: a given skin directory was only considered if it provided a default-language override for the sought filename, regardless of whether it also provided localizations for that filename. Discussion with Richard clarifies that we want to allow the user to override neither, either or both. Change findSkinnedFilenames() accordingly; update unit tests to verify new semantics.
2012-10-12Fix LLUI::locateSkin() failure case; clarify lldir.cpp static init.Nat Goodspeed
Per code review: Previous refactoring of LLUI::locateSkin() preserved odd failure behavior: it would return last-considered pathname, whether or not it exists. Changed to emit LL_WARNS log message and return empty string. Use Boost.Assign to simplify initialization of a couple static containers in lldir.cpp.
2012-10-11Change LLDir::findSkinnedFilenames() to use enum instead of bool.Nat Goodspeed
At Richard's suggestion, changed the bool merge parameter to new enum ESkinConstraint with values CURRENT_SKIN and ALL_SKINS. This clarifies what we're requesting at the point of the call.
2012-10-11Fixes for build issues, missing LLCOMMON_SYSTEM_INCLUDE_DIRS in some librariesBrad Payne (Vir Linden)