summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-13Merged SH-3339 work with sunshine-internal. Still a WIP.Logan Dethrow
2012-12-13WIP SH-3339. Commit to merge from trunk to get build fixes, etc.Logan Dethrow
2012-12-13Fix for SH-3591.prep@lindenlab.com
2012-12-12Updating appearance utility to deal with IMG_INVISIBLEDon Kjer
2012-12-12mergeBrad Payne (Vir Linden)
2012-12-12SH-3604 WIP - fixed a failure when base outfit link did not need to be createdBrad Payne (Vir Linden)
2012-12-12Fix for problem found with changing to an outfit with missing shapeBrad Payne (Vir Linden)
2012-12-12Fixes for SH-3591 & SH-3620prep
2012-12-12Updating linux libGLOD to match darwin namingDon Kjer
2012-12-11mergeBrad Payne (Vir Linden)
2012-12-11SH-3604 WIP - added base outfit link creation to retryable copy/link ↵Brad Payne (Vir Linden)
operations. Resolves race condition with cof version and server texture bakes
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internalLogan Dethrow
2012-12-11Fix for building on case-sensitive mac filesystems. Fix to remove unwind ↵Don Kjer
spam warnings while linking on xcode 4.5.2 builds
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 19:45:59 +0000