summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-07Deleting test_llcorehttp_peer.py because it has been corrupted by changes to ↵Logan Dethrow
test_llsdmessage_peer.py, which it was copied from. The file will be recreated using an unchanged file.
2012-12-06Automated mergeDon Kjer
2012-12-06Alpha rendering fixes for appearance utility.Don Kjer
2012-12-06On Linux now use the default system python instead of defaulting to ↵Logan Dethrow
python2.5. This was a holdover from when on linden systems 2.5 was newer than the default, instead of older.
2012-12-06SH-3604 FIX - switched link creation in updateCOF() to use retry path, ↵Brad Payne (Vir Linden)
better stats reporting, fixed failure logic
2012-12-05removed yet another unintended commit of logcontrol.xmlBrad Payne (Vir Linden)
2012-12-05mergeBrad Payne (Vir Linden)
2012-12-05Possible fix for TC build failureBrad Payne (Vir Linden)
2012-12-05Merge.Logan Dethrow
2012-12-05Linux Viewer build fixes.Logan Dethrow
* Removed no longer used unpack_bufsize from bitpack_test.cpp * Added llviewertexture_stub.cpp to the newview tests directory to fix llworldmap_test.cpp and llworldmipmap_test.cpp linker errors.
2012-12-05mergeBrad Payne (Vir Linden)
2012-12-05SH-3604 WIP - backed out logcontrol.xml changeBrad Payne (Vir Linden)
2012-12-05SH-3604 WIP - retry mechanism for batch inventory ops, handle either ↵Brad Payne (Vir Linden)
completion or failure
2012-12-05Added back in mesa package for linux buildsprep
2012-12-05Pull from viewer-developmentprep
2012-12-04SH-3604 WIPBrad Payne (Vir Linden)
2012-12-04tag merge of DRTVWR-255Nat Goodspeed
2012-12-03mergeBrad Payne (Vir Linden)
2012-12-03SH-3562 WIPBrad Payne (Vir Linden)
2012-12-01Fixed previous commit.Logan Dethrow
2012-11-30Fix for STORM-1854. Adapted the fix based on other open source consumers of ↵Logan Dethrow
fontconfig that were encountering the same error.
2012-11-30SH-3594: Fix for crash when outfits are changed on a non server based baking ↵prep@lindenlab.com
region.
2012-11-30SH-3562 WIP - detect possible hangs in item copyingBrad Payne (Vir Linden)
2012-11-29fix for possible crash on exit in self_av_string()Brad Payne (Vir Linden)
2012-11-28Automated mergeDon Kjer
2012-11-28Updating appearance utilityDon Kjer
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-27merge changes for DRTVWR-230Oz Linden
2012-11-27tag merge of DRTVWR-230Oz Linden
2012-11-26merge changes for DRTVWR-249Oz Linden
2012-11-26tag merge of DRTVWR-249Oz Linden
2012-11-20merge changes for DRTVWR-247Oz Linden
2012-11-20tag merge of DRTVWR-247Oz Linden
2012-11-20Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-20tag merge of DRTVWR-246Oz Linden
2012-11-20merge changes for DRTVWR-229Oz Linden
2012-11-20tag merge of DRTVWR-229Oz Linden
2012-11-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-19Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-19increment version to 3.4.4Oz Linden
2012-11-19merge tag for 3.4.2-releaseOz Linden
2012-11-19Added tag 3.4.2-release for changeset 16310aabccf3Oz Linden
2012-11-19Added tag 3.4.3-beta1 for changeset 94ab2b49458aOz Linden
2012-11-19Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-19mergeBrad Payne (Vir Linden)
2012-11-19Implementation for SH-3530, CR:Nyxprep@lindenlab.com
2012-11-19merge changes for DRTVWR-245Oz Linden
2012-11-19tag merge of DRTVWR-245Oz Linden
2012-11-19Added tag DRTVWR-232 for changeset f1d3b3fcab28Oz Linden