summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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.
2012-11-30Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-11-30MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people ↵Dave Parks
to update their drivers. Reviewed by Simon
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-30MAINT-1958 Fix for linux build after transplant.Dave Parks
2012-11-30Removed logging.Aura Linden
2012-11-29Crashlogger only runs when it comes from teamcity so I must checkin debug ↵Aura Linden
and wait. What fun.
2012-11-29fix for possible crash on exit in self_av_string()Brad Payne (Vir Linden)
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-28sync with viewer-developmenteli
2012-11-27New VFS objects included in every bite!Aura Linden
2012-11-27Tweak the example program (used as a performance tester) so that itMonty Brandenberg
will run with higher connection concurrencies. I'm using this to test the listener queue length reporting on apaches and everything is consistent and as expected with this change (stuck at eight before).