summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-02-24sync to latest viewer-development and viewer-autobuildOz Linden
2011-02-24pull latest changes from viewer-vs2010Oz Linden
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-24use our own domain for llhost_test; linux.org changed dns and broke itOz Linden
2011-02-23Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-developmentOz Linden
2011-02-23separate vertex buffer and index buffer when map/unmap VBO. can be treated ↵Xiaohong Bao
as part of STORM-1011. reviewed by davep.
2011-02-22update vstool to support vs2010.Alain Linden
2011-02-22Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-22set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking.Xiaohong Bao
2011-02-22more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused ↵Xiaohong Bao
leaking.
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-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-17merge changes from jenn_linden/viewer-vs2010Oz 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-17merge up from viewer-autobuildOz Linden
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-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-16for now, turn off precompiled header usage by default (so Incredibuild will ↵Alain Linden
work).
2011-02-16Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-16merging in latest viewer-developmentOz 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
2011-02-15Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-15partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused ↵Xiaohong Bao
leaking.
2011-02-15fix test failure caused by dubious method for testing an empty string.Alain Linden
2011-02-14debug_console is now resizableAndrew Meadows
Reviewed with Callum Linden.
2011-02-14bump version number to 2.7.0Oz Linden
2011-02-11STORM-975 : pull into viewer-developmentMerov Linden
2011-02-11STORM-833 : pull into viewer-developmentMerov Linden
2011-02-11STORM-937 : Use subprocess instead os commands in python, suppress crufty ↵Merov Linden
svn code
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-10STORM-986 : Fix for Linux buildMerov Linden