summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-06Added compiled AutoUpdater.nib made from new AutoUpdater.xibAura Linden
2012-12-06Fixed several minor issues with validation.Aura 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-05merge changes for MAINT-1951Nat Goodspeed
2012-12-05merge changes for 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-05merge changes for MAINT-1979Nat Goodspeed
2012-12-05merge changes for 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-04merge changes for DRTVWR-253Nat Goodspeed
2012-12-04merge changes for BUG-768Nat Goodspeed
2012-12-04Fix merge breakagesimon@Simon-PC.lindenlab.com
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04SH-3604 WIPBrad Payne (Vir Linden)
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-04MAINT-1953 Run through viewer stats and update GPU table with missing ↵Dave Parks
entries and new expected OpenGL versions
2012-12-04merge changes for DRTVWR-251Nat Goodspeed
2012-12-04merge changes for MAINT-1953Nat Goodspeed
2012-12-04Pull back upstream fixes from viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-03more for MAINT-1955: Viewer crashes while login after clearing cacheXiaohong Bao
2012-12-03more for MAINT-1955: Viewer crashes while login after clearing cacheXiaohong Bao
2012-12-03MAINT-1979 Viewer crashes while attempting to join group in the moment of ↵Kelly Washington
loading group members * Fix one race condition that could dereference a dangling pointer. reviewed with Simon and Baker.
2012-12-03MAINT-1748 Users have an ability to sell non existing objects from content ↵Kelly Washington
of other object * Keep the buy-contents floater subscribed to inventory changes on the object. reviewed with Simon
2012-12-03mergeBrad Payne (Vir Linden)
2012-12-03SH-3562 WIPBrad Payne (Vir Linden)
2012-11-30MAINT-1958 Trivial change to kick teamcity into behaving.Dave Parks
2012-12-01Fixed previous commit.Logan Dethrow
2012-11-30MAINT-1958 More robust error handling -- handle the case where the FBO ↵Dave Parks
allocation failure occurs when enabling lighting and shadows.
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 02:25:33 +0000