summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-19Automated merge with file:///Users/oz/Work/V-DOz Linden
2011-02-19make sure parallel builds are off for my test repos (and clean out some ↵Oz Linden
obsolete entries)
2011-02-18Merge.brad kittenbrink
2011-02-18Fix for failure to link Release builds due to :Release being an invalid path ↵brad kittenbrink
name on windows.
2011-02-18Fix for packaging failure. Installer was missing the SecondLife.exe binarybrad kittenbrink
due to improperly disabled msvcrt manifest checking. reviewed by jenn.
2011-02-18use improved packaging for jsoncppOz Linden
2011-02-18Automated merge with ssh://bitbucket.org/oz_linden/viewer-vs2010Oz Linden
2011-02-18Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Alain Linden
2011-02-18remove installable mesa for windows; not used.Alain Linden
2011-02-18Merge with headcallum
2011-02-18Pull in autobuild derrived jpeglib (version 8c) for Windows MSVC 2010callum
2011-02-18pull changes from vs2010Oz Linden
2011-02-18Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-18merge max fixes from merov.Andrew A. de Laix
2011-02-18BUG STORM-1004 FIXED Unblocking/blocking name sometimes deletes identically ↵paul_productengine
named entry, but of different TYPE LLMuteList stores muted objects in two sets: set of names and set of ids. Avatar objects are stored by ids (set of ids), other objects can be stored both by name(set of names) or ids - Delete items from corresponding set (from set of names or ids), not form both sets at time. - Improved isMuted method's logic. Now if avatar is tested whether it's muted or not, don't search its name in the set of names.
2011-02-18merge changes for viewer-vs2010Oz Linden
2011-02-18merge mac autobuild fix from MerovOz Linden
2011-02-17Autobuild: fix for Mac build using XCodeMerov Linden
2011-02-17VWR-24917 Use mIsDisplayNameDefault to reduce name redundancy in nearby chat ↵Ardy Lay
history * Clean up changes based upon feedback from reviewers. * Improve comment based upon feedback from reviewers.
2011-02-17merge changes from jenn_linden/viewer-vs2010Oz Linden
2011-02-17Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Alain Linden
2011-02-17update to latest apr_suite package.Alain Linden
2011-02-17Ported over mani's patch for handling finding of the RO appdata dir when ↵brad kittenbrink
running from the debugger. ported from changeset https://hg.lindenlab.com/alain/indra-common/changeset/99a9d1876e83/ reviewed by Richard.
2011-02-17Automated merge with file:///Users/oz/Work/viewer-vs2010Oz Linden
2011-02-17merge up from viewer-autobuildOz Linden
2011-02-17adjust parameters for integration buildOz Linden
2011-02-17Automated merge with file:///Users/oz/Work/V-DROz Linden
2011-02-17STORM-842 FIXED displaying favorites list at login screen when user name is ↵Seth ProductEngine
typed like "firstname.lastname" or "firstname_lastname" or user name consists of a single word.
2011-02-17merge changes for storm-937Oz Linden
2011-02-17Cherrypick Merov's fix for update_version_files.py.Christian Goetze (CG)
2011-02-17merge changes for storm-937Oz Linden
2011-02-17catch up with viewer-beta branchEli Linden
2011-02-17merge changes for viewer-autobuildOz Linden
2011-02-17merge lastest changes from viewer-vs2010Oz Linden
2011-02-17explicity call python scripts with python so they work on all platforms.Andrew A. de Laix
2011-02-17try disabling parallel builds in TC for LinuxOz Linden
2011-02-16STORM-987 : Allow more flexibility around input and output listsMerov Linden
2011-02-16Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-16Automated merge with file:///Users/oz/Work/viewer-autobuildOz Linden
2011-02-16fix dos line endingsOz Linden
2011-02-16STORM-987 : Implement in and out list of files and pattern matchingMerov Linden
2011-02-16SOCIAL-544 PARTIAL move skylight skin to viewer repoRichard Linden
2011-02-16turn off parallel linux builds; they don't work for autobuild driven builds.Alain Linden
2011-02-16for now, turn off precompiled header usage by default (so Incredibuild will ↵Alain Linden
work).
2011-02-16temporarily turn off precompiled header usage to work around Incredibuild ↵Alain Linden
issues.
2011-02-16Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-16merging in latest viewer-developmentOz Linden
2011-02-16use new packages.Alain Linden
2011-02-16fix for INTEGRATION_TEST_llcapabilitylistener (include Python to run with ↵Alain Linden
correct python executable).
2011-02-16merge changes for storm-981Oz Linden