summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-18Merge 3.5.8-releaseIma Mechanique
2013-10-18storm-1831 Incorporating Oz's changes to update libxml on linux to libxml2Ima Mechanique
2013-10-18storm-1831 Fixing colors xml broken by me during last merge :-(Ima Mechanique
2013-10-18removed asserts in order to get testable builds againRichard Linden
added unpause() behavior and changed pause() to do nothing when already stopped
2013-10-17Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-10-17fix for SH-4569: Objects are not culled by size in the distanceXiaohong Bao
2013-10-17fix for assert at runtime (reading stats from recording while it was active)Richard Linden
fix for bad values returns from getPeriodMin and getPeriodMax on count stats when no counts recorded fix for gcc compile time error (typename ftw)
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-17BUILDFIX: bad typedefRichard Linden
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-17SH-4160 WIP, build fixBrad Payne (Vir Linden)
2013-10-17Pull merge from oz_linden/336-snowstormMerov Linden
2013-10-17mergeBrad Payne (Vir 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-16moved tree iterators into llfasttimer.hRichard Linden
2013-10-16Pull merge from lindenlab/viewer-releaseMerov Linden
2013-10-16Fix merge error in llvoavatarGraham Linden
2013-10-16Merge 3.6.8Graham Linden
2013-10-16mergeBrad Payne (Vir Linden)
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-16SH-3455 BUILDFIX Updating linux appearance utility to use the new refactorNyx Linden
Eliminated some unnecessary functions that the refactor took care of, linux build should be fixed.
2013-10-16mergeBrad Payne (Vir Linden)
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
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-15Renaming file to better reflect it's actual usage for the future.Ima Mechanique
2013-10-15STORM-1831 Removing unnecessary semi-colonIma Mechanique
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-15mergeBrad Payne (Vir Linden)
2013-10-15SH-3455 WIP - llstartup cleanupBrad Payne (Vir Linden)
2013-10-14Pull merge with lindenlab/viewer-bearMerov Linden
2013-10-14Pull merge from lindenlab/viewer-releaseMerov Linden
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-12STORM-1831 Importing Oz's updates for libxml2Ima Mechanique
2013-10-11STORM-1972 Add forgotten credit in contributions.txtDrake Arconis
2013-10-11STORM-1972 Restore missing particle info display menu itemDrake Arconis