summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentLogan Dethrow
2012-12-10merge changes for DRTVWR-260Oz Linden
2012-12-10tag merge of DRTVWR-260Oz Linden
2012-12-10SH-3606 WIP - fixed bug found by persnickety compilerBrad Payne (Vir Linden)
2012-12-10pull back release tagsOz Linden
2012-12-10Added tag 3.4.3-release for changeset 5cba5f39d0a8Oz Linden
2012-12-10merge release tagOz Linden
2012-12-10removed inadvertent commit of logcontrol.xmlBrad Payne (Vir Linden)
2012-12-10SH-3606 WIP - replaced several LLInventoryCallback subclasses with ↵Brad Payne (Vir Linden)
boost::func equivalents
2012-12-10mergeBrad Payne (Vir Linden)
2012-12-07Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to ↵Logan Dethrow
point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake.
2012-12-07Merge in backed out changes.Logan Dethrow
2012-12-07Backed out changeset 69636bceb5a2.Logan Dethrow
2012-12-07Backed out changeset 227671259809.Logan Dethrow
2012-12-07Backed out changeset 5cf865a7afa7Logan Dethrow
2012-12-07Restored test_llcorehttp_peer.py, hopefully breaking the 'hg copy' link that ↵Logan Dethrow
was causing changesets intended for its copy parent to be applied to the child file.
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-07SH-3606 WIP - moving classes to more reusable locationBrad Payne (Vir Linden)
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-05merge changes for MAINT-1955Nat Goodspeed
2012-12-05merge changes for DRTVWR-259Nat Goodspeed
2012-12-05tag merge of DRTVWR-259Nat Goodspeed
2012-12-05merge changes for MAINT-1951Nat Goodspeed
2012-12-05merge changes for DRTVWR-257Nat Goodspeed
2012-12-05tag merge of DRTVWR-257Nat Goodspeed
2012-12-05merge changes for MAINT-1953Nat Goodspeed
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-05merge changes for DRTVWR-258Nat Goodspeed
2012-12-05tag merge of DRTVWR-258Nat Goodspeed
2012-12-05merge changes for MAINT-1979Nat Goodspeed
2012-12-05Added back in mesa package for linux buildsprep
2012-12-05merge changes for DRTVWR-256Nat Goodspeed
2012-12-05tag merge of DRTVWR-256Nat Goodspeed
2012-12-05Pull from viewer-developmentprep
2012-12-05merge changes for MAINT-1955, MAINT-1958Nat Goodspeed
2012-12-05merge changes for DRTVWR-254Nat Goodspeed
2012-12-05tag merge of DRTVWR-254Nat Goodspeed
2012-12-04merge changes for DRTVWR-253Nat Goodspeed
2012-12-04tag merge of DRTVWR-253Nat Goodspeed
2012-12-04merge changes for BUG-768Nat Goodspeed