summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2013-12-02Merge with 3.6.11dolphin
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-10-25Fix release merge issues (included upstream changes not yet in release from ↵Graham Linden
bear)
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-25Merge with 3.6.9dolphin
2013-10-22Merge with viewer-beardolphin
2013-10-04Merge with 3.6.7dolphin
2013-10-03merge changes for 3.6.7-releaseOz Linden
2013-09-18Merge with 3.6.6-releasedolphin
2013-09-18merge changes for 3.6.6-releaseOz Linden
2013-09-10remove llversionviewer.h (incorrectly re-created in a merge)Oz Linden
2013-09-09Merge downstream code with viewer-releasesimon_linden
2013-09-09Merge viewer-release 3.6.5 CocoaGraham Linden
2013-09-09Merge viewer-releasesimon
2013-09-09Merge with 3.6.5dolphin
2013-08-27Mergedolphin
2013-08-27MAINT-3065 : Avatar render info's 'geometry' stat is unpredictable for ↵simon
linked objects Removed "geometry" and "surface" Reviewed by Kelly
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge the CHUIstorm 3.6.5Graham Linden
2013-08-26Tweak MAINT-3046 fix for faster remove_() performancesimon
2013-08-23MAINT-3046 fix test regression from debug llassert accidentally checked in ↵Graham Linden
with crash fix
2013-08-23MAINT-3046 make LLNotifications clear out vecs of LLNotificationChannelPtr ↵Graham Madarasz (Graham Linden)
so singleton cleanup doesn't do things it really ought not do
2013-08-27Merge downstream codesimon_linden
2013-08-26Merge downstream code for CHUIStormsimon
2013-08-22MAINT-2850 Fix for linux builddmitry
2013-08-21Merge downstream code, including viewer-releasesimon
2013-08-21Fix file EOL formatSimon Linden
2013-08-20MAINT-2850 FIXED Windows 8.1 detected as running in windows 8 compatibility ↵dmitrykproductengine
mode always
2013-08-20MAINT-3005 FIXED Set max persistent notifications to reduce log-in timemaxim@mnikolenko
2013-10-23Merge latest viewer-release with FBCsimon
2013-08-08Pull in fix for MAINT-2302simon
2013-07-02MAINT-1260 add missing PRIM_ constants to syntax highlighting. Reviewed by ↵Maestro Linden
Kelly.
2013-06-29MAINT-2302: Make llprocess test<6> output less like a build error.Nat Goodspeed
build.sh LogScan greps for "error:" (among other things) so removing the colon from the test name "syntax_error" should help.
2013-06-29MAINT-2302: Re-enable previously-disabled LLProcess tests for diagnosis.Nat Goodspeed
2013-06-27Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-19Merge with viewer-release.Geenz
2013-06-19Merge with viewer 3.6.0dolphin
2013-06-18Merge vwr-dev-matGraham Linden
2013-06-18remove files incorrectly brought back from the past by mergesOz Linden
2013-06-17Merged with viewer-releaseGeenz
2013-06-15Silence spurious asserts when pool is cleared at exactly it's limitGraham Linden
2013-06-10MAINT-2777 work-around for APR assert_always causing random crash in ↵Graham Madarasz
materials build
2013-06-07Merge MAINT-2740 crash fixGraham Madarasz
2013-06-05Unwind cruft from hunting for 2707 they won't end up in vwr-dev-matGraham Madarasz
2013-06-05MAINT-2740 more comment grooming and NULL string guardGraham Madarasz
2013-06-05BUG-2707 fix comment typos, remove unnecessary winmm_shim changes, and ↵Graham Madarasz
revert 2672 fix included only for local integ test
2013-06-05BOOG2707 uncomment cleared suspectsGraham Madarasz
2013-06-04MAINT-2740 put debug output back with guard of debugger presence per Nat ↵Graham Madarasz
review suggestion
2013-06-04MAINT-2740 convert to std::string based API for OutputDebug wrapper ↵Graham Madarasz
cleanliness after sage counsel (slight refrain)
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-13 11:22:23 +0000