summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-27MAINT-3074: Remove warning log that kills FPSOz Linden
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge. Pull in viewer-release after SSA merge.Monty Brandenberg
2013-08-26Merge. Refresh from viewer-release after SSA.Monty Brandenberg
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-26Merge the CHUIstorm 3.6.5Graham Linden
2013-08-26Tweak MAINT-3046 fix for faster remove_() performancesimon
2013-08-26correct merge error in llupdatechecker.cppOz Linden
2013-08-26remove unused --logevents command line option because new validation causes ↵Oz Linden
unmapped options to be errors
2013-08-26Okay, move openssl back to the weird 0.9.8/1.0.0 mix it wasMonty Brandenberg
before. Move libcurl forward to 7.24.0 and built on 0.9.8. Until we do some TC work, we may be stuck with this combo.
2013-08-26merge changes for 3.6.4-releaseOz Linden
2013-08-26increment viewer version to 3.6.5Oz Linden
2013-08-26Added tag 3.6.4-release for changeset 91ed595b716fOz Linden
2013-08-26MAINT-1453 ifdef around windows-only work-around to restore 8x and 16x AA ↵Graham Madarasz (Graham Linden)
modes on Mac
2013-08-24added Google Analytics query parameters to URLs for FBC photos and checkins ↵Cho
for ACME-854
2013-08-23Moved OpenSSL to 1.0.1e as an experiement. Can't build llqtwebkitMonty Brandenberg
so that doesn't move. 3p-curl does, however, and this gets them all. I suspect I'll be backing down to 0.9.8 next week.
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-23MAINT-2575 FIXED Resident can accept unlimited number of friendship requests ↵maksymsproductengine
if they were sent before his first accept
2013-08-29MAINT-3068 FIXED Inconsistent option menus on resident names in ↵dmitry
Conversations floater
2013-08-27Merge downstream codesimon_linden
2013-08-26Merge downstream code for CHUIStormsimon
2013-08-26MAINT-3041 (crash in LLScrollContainer::updateScroll() on Windows)MaximB ProductEngine
2013-08-22Automated merge with ssh://hg.lindenlab.com/monty/viewer-drano-http-3Monty Brandenberg
2013-08-22Okay, move openssl back to 0.9.8q as we have compiler issuesMonty Brandenberg
on the build farm. This, at least, gets us through the openssl-> libcurl->viewer dependency chain.
2013-08-22merging viewer releaseGilbert Gonzales
2013-08-22merge changes for maint-2773Oz Linden
2013-08-22MAINT-2904 FIXED (Users of "LittleSight" viewer are invisible but can listen ↵Mnikolenko ProductEngine
to spatial chat)
2013-08-22MAINT-2852 FIXED Update Help Menu and behavior: F1 Help menu no longer ↵dmitry
delivers results when searching dance, appearance or scripts
2013-08-22MAINT-2850 Fix for linux builddmitry
2013-08-22MAINT-2773: Disable texture animation doesn't workAnsariel
2013-08-21Merge downstream code, including viewer-releasesimon
2013-08-21Fix file EOL formatSimon Linden
2013-08-21Merge viewer-releasesimon
2013-08-21mergemberezhnoy
2013-08-21MAINT-3020 ([CHUI] Torn off nearby chat is no longer visible after exiting ↵mberezhnoy
mouselook)
2013-08-21merge changes for storm-1953Oz Linden
2013-08-21merge changes for storm-1952Oz Linden
2013-08-20MAINT-2850 FIXED Windows 8.1 detected as running in windows 8 compatibility ↵dmitrykproductengine
mode always
2013-08-20merge changes for 3.6.3-releaseOz Linden
2013-08-20MAINT-3005 FIXED Set max persistent notifications to reduce log-in timemaxim@mnikolenko
2013-08-19Fix merge regressions from missed changes to LoD updatesGraham Linden
2013-08-19MergeGraham Linden
2013-08-19Fix merge issues from genBBoxes optimizations fighting with genBBoxes ↵Graham Linden
optimizations and missing statics
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-19Merge in viewer-releaseGraham Linden
2013-08-19MergeArun Bapu
2013-08-19increment viewer version to 3.6.4Oz Linden