summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
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 completi...Brad Payne (Vir Linden)
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
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 entries...Dave Parks
2012-12-04merge changes for DRTVWR-251Nat Goodspeed
2012-12-04tag merge of 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-04tag merge of DRTVWR-255Nat Goodspeed
2012-12-04tag merge of DRTVWR-252Nat Goodspeed
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 loa...Kelly Washington
2012-12-03MAINT-1748 Users have an ability to sell non existing objects from content of...Kelly Washington
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 alloca...Dave Parks
2012-11-30Fix for STORM-1854. Adapted the fix based on other open source consumers of f...Logan Dethrow
2012-11-30Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks