summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2010-12-22Merge with viewer-developmentDon Kjer
2010-12-21Merge from trunkAndrew A. de Laix
2010-12-21Automated merge up from viewer-developmentLoren Shih
2010-12-21Automated merge from mesh-developmentLoren Shih
2010-12-20mergeBrad Payne (Vir Linden)
2010-12-20SH-682 FIX, SH-594 FIX - removed mFMP wrapper, added thread checking. Moved ↵Brad Payne (Vir Linden)
onIdle functions to llcallbacklist.
2010-12-20thread safety checkingBrad Payne (Vir Linden)
2010-12-17Merge from viewer-development post 2.4 releaseMonty Brandenberg
2010-12-17SH-682 WIP: allow DEBUG_FAST_TIMER_THREADS to work when enabledBrad Payne (Vir Linden)
2010-12-16Automated merge up from viewer-developmentLoren Shih
2010-12-15Merge from don_linden/viewer-sandboxDon Kjer
2010-12-15pulling fixes back from viewer-betaOz Linden
2010-12-14Automated merge with https://bitbucket.org/mani_linden/viewer-developmentNat Goodspeed
2010-12-14SWAT-352: when loading lleventhost, call apr_dso_error() function.Nat Goodspeed
In addition to its usual apr_sterror() function, APR defines a special function specifically for errors relating to the apr_dso_*() functions. Introduce ll_apr_warn_status() and ll_apr_assert_status() overloads accepting apr_dso_handle_t* to call apr_dso_error() as well as apr_strerror() and log its output. Use new ll_apr_warn_status() in LLAppViewer::loadEventHostModule() for apr_dso_load() and apr_dso_sym() calls. Instead of shorthand ll_apr_assert_status(), use with llassert_always() so check is still performed even in Release build. Add more lleventhost-related debugging output, e.g. full pathname of the DLL. On Mac and Linux, call 'file' command to report nature of the DLL too.
2010-12-14Mergebrad kittenbrink
2010-12-13permit flush when disabled.Andrew A. de Laix
2010-12-13Merge from viewer-developmentDon Kjer
2010-12-13Automated merge up from viewer-developmentLoren Shih
2010-12-10Automated merge with https://bitbucket.org/mani_linden/viewer-development/Andrew A. de Laix
2010-12-10fix possible crash on shutdown in event queue flush.Andrew A. de Laix
2010-12-10fix working directory in install script and remove dependency on open option ↵Andrew A. de Laix
--args which is 10.6 only. Also fix erroneous check in process launcher which was mistakenly reporting a failed execution of the new updater script.
2010-12-10fix crash if posting event during shutdown.Andrew A. de Laix
2010-12-09Pull from viewer-betaMerov Linden
2010-12-09merge from http://hg.secondlife.com/viewer-developmentMonty Brandenberg
2010-12-08Merge from http://bitbucket.org/simon_linden/viewer-devDon Kjer
2010-12-08CHOP-239: reconcile LL_VERSION_BUNDLE_ID with Info-SecondLife.plist.Nat Goodspeed
The bundle ID is found in llversionviewer.h, Info-SecondLife.plist and mac_updater.cpp. The latter two state it as "com.secondlife.indra.viewer". llversionviewer.h stated it as "com.secondlife.snowglobe.viewer". Changing it to "indra" to be consistent. For further discussion, please see the Jira.
2010-12-03Mergeleyla_linden
2010-12-03mergeBrad Payne (Vir Linden)
2010-12-03Added timer-related logging during logperformanceBrad Payne (Vir Linden)
2010-12-03#ifdef out ll_align_malloc/free (gcc 4.2 is unhappy about some of the syntax ↵Dave Parks
there)
2010-12-02MergeDave Parks
2010-12-02ESC-211 Metrics data sink - fix delivery by viewerMonty Brandenberg
The TextureFetch thread was still stalling out due to a different path that determines whether there is work or not in the thread (uses getPending()) and that had to be harmonized with the changes to runCondition(). I'm not happy with this solution but a refactor of the LLThread tree isn't in the cards right now.
2010-12-02mergeBrad Payne (Vir Linden)
2010-12-02Cleaning up fast timer fixesBrad Payne (Vir Linden)
2010-12-02Avoiding more RDTSC dependencies in fast timersBrad Payne (Vir Linden)
2010-12-02Automated mergeLoren Shih
2010-12-01Still fixing non-windows buildsBrad Payne (Vir Linden)
2010-12-01Fixing linux build failureBrad Payne (Vir Linden)
2010-12-01Moving timer code for AMD issue diagnosisBrad Payne (Vir Linden)
2010-12-01Automated merge up from viewer-developmentLoren Shih
2010-11-30Use architecture-independent code for windows fast timersBrad Payne (Vir Linden)
2010-11-24Pull from viewer-betaMerov Linden
2010-11-23[mq]: thread_state_fixAndrew A. de Laix
2010-11-22CTS-320 SH-465 FIX use system zlib for standalone buildsNyx (Neal Orman)
pulling boroondas' changes to change our includes to use the system versions of zlib if doing a standalone build. Code changes are minimal, and appear to work correctly. Approved. - Nyx
2010-11-22SH-466 FIX fix of VWR-20670/SNOW-506 lost in mergeNyx (Neal Orman)
Verified that the fix is no longer in mesh-development. Verified fix is still in viewer-development. Fix is simply changing visibility of LLInstanceTracker base in LLEventTimer from protected to public. The lack of this fix indicates a bad merge. Re-applying fix.
2010-11-22increment viewer version number to 2.5Oz Linden
2010-11-19ER-330 : Improve ObjectUpdateCached message packing. Added some viewer ↵Dave SIMmONs
metrics, will disable later.
2010-11-19Automated merge with http://bitbucket.org/lindenlab/viewer-developmentBill Curtis
2010-11-19Don't use llwarns/llinfos from a background thread.Dave Parks
2010-11-19Automated merge with file:///Users/Bill/Projects/viewer-releaseBill Curtis