summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-26BUILDFIX: corrected template parameter for LL_BAD_TEMPLATE_INSTANTIATION ↵Richard Linden
macro in llunit
2013-08-26fixed eol typeRichard Linden
2013-08-26Automated merge with http://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-08-26removed some unecessary template parameters from LLUnit member functionsRichard Linden
forced unit conversion code to inline unit conversion now no longer converts all the way to base and back, but tries to find equivalent units as early as possible fixed another llinfos instance scene monitor now outputs n/a for invalid samples
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-26added compile time warnings to use of deprecated llinfos, llwarns, etc.Richard Linden
2013-08-26reversion of rendering starts late changeXiaohong Bao
2013-08-26reversion of object cache version number changeXiaohong Bao
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-23updated appearance utility sourceRichard Linden
2013-08-23updated appearance utility sourceRichard Linden
2013-08-23Automated merge with https://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-08-23fixed issue with poor framerate after clearing cacheRichard Linden
2013-08-23BUILDFIX: replaced function that was accidentally removedRichard Linden
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-23BUILDFIX: reverted some debugging changes to llerror.cppRichard Linden
2013-08-23mergeRichard Linden
2013-08-23BUILDFIX: fix for crashes in unit tests on mac and linuxRichard Linden
2013-08-23MAINT-3031: Toggle Expanding CHUI when Icon is CLickedPavelK ProductEngine
2013-09-06MAINT-3030 [CHUIBUG]Conversations pane has alignment issues when collapsedPavelK ProductEngine
2013-09-30MAINT-3193 FIXED crash with LLControlCache<bool>::LLControlCache: Control ↵MaximB ProductEngine
named RenderAutoMuteLoggingnot found.
2013-09-27Merge downstream codesimon
2013-09-26Archon mergeGraham Madarasz (Graham Linden)
2013-09-26MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for ↵Graham Madarasz (Graham Linden)
SLURL handling
2013-08-23Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-08-23temporary fix for rendering starts late when running on pdp stationXiaohong Bao
2013-08-23more fix for SH-4400: Interesting: Side effect 1 of unloading culled objects.Xiaohong Bao
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-23Automated merge with https://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-08-22mergeRichard Linden
2013-08-22BUILDFIX: accidental checkin of infinite loop in llsdserialize testRichard Linden
2013-08-22BUILDFIX: attempted fix for crash on exit in llsdserialize testRichard Linden
2013-08-22Automated merge with ssh://hg.lindenlab.com/monty/viewer-drano-http-3Monty Brandenberg