summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-17Merge. Pull in viewer-release after 3.6.8 fixes for AMD graphics.Monty Brandenberg
2013-10-17Pull merge from viewer-releaseMerov Linden
2013-10-17BUG-4185 : Fix glsl compilation error on MacMerov Linden
2013-10-17Mergesimon
2013-10-17SUN-69 MAINT-2258 : temp attachments getting removed improperly. Reviewed ↵simon
by Kelly.
2013-10-17BUILDFIX: bad typedefRichard Linden
2013-10-17MAINT-3330 fix regression on mac caused by shader change for 3107 by rolling ↵Graham Linden
back to prev version of shader
2013-10-17Fixed slurl saving for the experience profile floaterdolphin
2013-10-17Automated merge with ↵Richard Linden
bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg._vi9rd\http__bitbucket.org_lindenlab_viewer-interesting_s1et2g.hg
2013-10-17moved root timer to global variableRichard Linden
added flag to LLInstanceTracker to allow multiple values per key made StatType allow multiple values per key to eliminate block timer related crash
2013-10-17Updated experience profile to remove the permission buttons on privilegeddolphin
experiences and fix the enabling of the save button with the checkbox controls.
2013-10-17Pull merge from oz_linden/336-snowstormMerov Linden
2013-10-16more fix for SH-4552: Interesting: objects sometimes fail to load after ↵Xiaohong Bao
teleport.
2013-10-16Pull merge from lindenlab/viewer-releaseMerov Linden
2013-10-16Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-10-16fix for SH-4552: Interesting: objects sometimes fail to load after teleport.Xiaohong Bao
2013-10-16fix INTL-126 fix incorrectly translated Boolean values in XUI; remove some ↵eli
obsolete strings
2013-10-16moved tree iterators into llfasttimer.hRichard Linden
2013-10-16Fix merge error in llvoavatarGraham Linden
2013-10-16Merge 3.6.8Graham Linden
2013-10-16Merge viewer-releasesimon
2013-10-17MAINT-3294 (Microphone button clipped when resizing Conversations List in CHUI)MaximB ProductEngine
2013-10-16Merged 3.6.8-releaseScott Lawrence
2013-10-16Merged 3.6.8-releaseScott Lawrence
2013-10-16increment viewer version to 3.6.9oz@lindenlab.com
2013-10-16Added tag 3.6.8-release for changeset d40c66e41074oz@lindenlab.com
2013-10-16MAINT-3312 : crash in LLVOAvatar::lazyAttach(). Reverted some earlier changessimon
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-15Added LLTabContainer::getTotalTabWidthdolphin
Cleaned up experience profile floater
2013-10-15Automated merge with http://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-10-15added params for project interestingRichard Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-15Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-10-15fix for SH-4551: Interesting: some attachments do not appear after teleportXiaohong Bao
2013-10-15add cached object count statRichard Linden
2013-10-14Pull merge with lindenlab/viewer-bearMerov Linden
2013-10-14Pull merge from lindenlab/viewer-releaseMerov Linden
2013-10-14Updated strings for the experience list floaterdolphin
2013-10-14changed ll_aligned_(malloc|free) to take alignment size as a template argumentRichard Linden
2013-10-14MAINT-3290 FIXED Handle correctly Mouse Capture for LLTextBox.Mnikolenko ProductEngine
2013-10-14mergeMnikolenko ProductEngine
2013-10-11MAINT-2968 Transplant cleanup.Dave Parks
2013-10-11MAINT-2968 Transplant cleanup.Dave Parks
2013-10-11Automated merge with http://bitbucket.org/lindenlab/viewer-interestingRichard Linden
2013-10-11fixed legacy usage of llendlRichard Linden
2013-10-10merged in recent changesJJ Linden
2013-10-10adding quicklinks for extra packages:wJJ Linden
2013-10-10MAINT-2968 Fix for crash on AMD hardware running current drivers.Dave Parks
2013-10-10MAINT-2968 Fix for crash on AMD hardware running current drivers.Dave Parks
2013-10-11Automated merge with http://bitbucket.org/lindenlab/viewer-bearDave Parks