summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-02-24Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-24Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Jennifer Leech
2011-02-24Merged changes from bitbucket.org/squire_linden/viewer-vs2010Jennifer Leech
2011-02-24integrate xmlrpc-epi into windows build.Alain Linden
2011-02-22update vstool to support vs2010.Alain Linden
2011-02-21Changes windows build and PNG cmake to reflect latests libpng buildssquire
2011-02-19Do not add <jsonpath>/include/json as an include director. Instead use ↵Nicky
<jsonpath>/include. Otherwise include/json/features.h will mask /usr/include/features.
2011-02-23Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-21change host reverse lookup test to use our own host (linux.org failed)Oz Linden
2011-02-19Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
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-18merge max fixes from merov.Andrew A. de Laix
2011-02-17Autobuild: fix for Mac build using XCodeMerov 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-17Cherrypick Merov's fix for update_version_files.py.Christian Goetze (CG)
2011-02-16for now, turn off precompiled header usage by default (so Incredibuild will ↵Alain Linden
work).
2011-02-16fix for INTEGRATION_TEST_llcapabilitylistener (include Python to run with ↵Alain Linden
correct python executable).
2011-02-15fix test failure caused by dubious method for testing an empty string.Alain Linden
2011-02-11explicitly import ZLIB.Alain Linden
2011-02-10various fixes to get the debug build working; don't look for or copy ↵Alain Linden
msvc*80.dll's.
2011-02-08fix a couple more packaging problems...Alain Linden
2011-02-07update pacageing of msvc?100.dll's; use latest qt package with all needed libs.Alain Linden
2011-02-07there is no mt for vs2010Alain Linden
2011-02-04fix linking to llqtwebkit.Alain Linden
2011-01-31Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Alain Linden
2011-01-31build uses latest jsoncpp package with new layout.Alain Linden
2011-01-31update mac and linux json libs.Andrew A. de Laix
2011-01-31HACK just to get the build to work. FIX THIS TEST!Alain Linden
2011-01-31find latest DirectX dirs.Alain Linden
2011-01-31patches to use new jsoncpp lib on windowsAlain Linden
2011-01-26Updated Windows build flags to set _SECURE_SCL. Removed some duplicate ↵Mark Palange (Mani)
declarations.
2011-01-25Merge in changes from mani_linden/viewer-vs2010jenn
2011-01-24hack to work around gcc 4.2 compiler warning; really we should not store ↵Andrew A. de Laix
static strings in char * pointers (they should all be changed to const char *).
2011-01-24Automated merge with https://bitbucket.org/lindenlab/viewer-developmentAndrew A. de Laix
2011-01-24Updated boost libMark Palange (Mani)
2011-01-24merge changes for beta fixesOz Linden
2011-01-24fix warnigs caused by skipping test.Alain Linden
2011-01-24merge changes for i18n fixesOz Linden
2011-01-24VWR-24321: fix validation of textures that start with 00Aleric Inglewood
2011-01-21INTL-20,CT-635 WIP DE,FR,ES,PT,PL translation (new files) for Viewer 2.5Eli Linden
2011-01-21INTL-20,CT-635 WIP DE,FR,ES,PT,PL translation for Viewer 2.5Eli Linden
2011-01-21MergeMark Palange (Mani)
2011-01-21Disabled media_plugin_webkit dependency, temporarilyMark Palange (Mani)
2011-01-21Code fixes for VS2010 compatibilityMark Palange (Mani)
2011-01-21VWR-24519: make debugging easier by not spawning spare processAleric Inglewood
2011-01-21merge changes for vwr-24347Oz Linden
2011-01-21VWR-24354: correct manifest dependencies to prevent parallel install problemAleric Inglewood
2011-01-21merge changes for storm-844Oz Linden