summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Expand)Author
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
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-05BUG-2707 fix comment typos, remove unnecessary winmm_shim changes, and revert...Graham Madarasz
2013-06-04MAINT-2740 convert to std::string based API for OutputDebug wrapper cleanline...Graham Madarasz
2013-06-04MAINT-2740 fix XUI callsites in debug modeGraham Madarasz
2013-06-04MAINT-2740 and MAINT-2672 rework after code review for 2740 fix and include 2...Graham Madarasz
2013-06-04MAINT-2740 make use of OsOutputDebugString _DEBUG only to avoid interactions ...Graham Madarasz
2013-06-04BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid thro...Graham Madarasz
2013-06-03BUG-2707 and not break use of venerable ifdefsGraham Madarasz
2013-06-03BUG-2707 disable sites calling OsOutputDebugString directly to identify which...Graham Madarasz
2013-05-29Merge downstream codesimon
2013-05-29Merge latest viewer-releasesimon
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-22CHUI-967: fix display of % escapes in chatGilbert Gonzales
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-24diff -r 59c7bed66dfd indra/llcommon/lleventapi.hsimon
2013-04-23Revert LLThreadSafeRefCount optimization; caps fetching was failing. Reviewe...simon
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-12Fix merge odditiessimon
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-02Merged in chui beta code.prep@lindenlab.com
2013-03-29CHUI-807 : Add more defensive coding. Also trace in log the sessions created ...Merov Linden
2013-03-29Merged in Chui beta6+ fixesprep@lindenlab.com
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28CHUI-905 (Viewer crashes while using Insert keyboard key in chat): Problem wa...Gilbert Gonzales
2013-03-28CHUI-855 FIXED Text entry bar auto expand does not resizemaksymsproductengine
2013-03-26CHUI-846 ([crashhunters] crash in LLFontGL::maxDrawableChars): Added logging ...Gilbert Gonzales
2013-03-25Pull in downstream CHUI code from viewer-developmentsimon
2013-03-22Pull and merge latest viewer-betasimon
2013-03-25mergemberezhnoy
2013-03-25CHUI-885 (View Profile,Send IM and Add friend are not functional in context m...mberezhnoy
2013-03-21CHUI-881 ([CHUIBUG]Viewer crashes when user drag and drop the participant fro...Gilbert Gonzales
2013-03-20Merge with viewer-chuiprep@lindenlab.com
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-16CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on L...merov
2013-03-15CHUI-807 : More defensive code. Don't assume anything while iterating through...Merov Linden
2013-03-14MergeGraham Madarasz (Graham Linden)
2013-03-14Rollback Maestro interp changesGraham Madarasz (Graham Linden)
2013-03-14Rollback fix for Maestro 'Jitter Bug' which is causing issues elsewhereGraham Madarasz (Graham Linden)
2013-03-13More fixes for gcc-4.6 breakageDon Kjer
2013-03-13Fixed unit test compile errorprep
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
2013-03-12Mods to make compile on gcc 4.6.3 work mo bettaGraham Madarasz